/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/version.py

https://launchpad.net/bugs/819604
Merge the fix for bug #819604 into trunk, resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/version.py
73
73
    else:
74
74
        to_file.write(bzrlib.__path__[0] + '\n')
75
75
    if show_config:
76
 
        config_dir = os.path.normpath(config.config_dir())  # use native slashes
 
76
        config_dir = osutils.normpath(config.config_dir())  # use native slashes
77
77
        if not isinstance(config_dir, unicode):
78
78
            config_dir = config_dir.decode(osutils.get_user_encoding())
79
79
        to_file.write("  Bazaar configuration: %s\n" % (config_dir,))