~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/version.py

  • Committer: Martin Packman
  • Date: 2011-10-06 16:41:45 UTC
  • mfrom: (6015.33.10 2.4)
  • mto: This revision was merged to the branch mainline in revision 6202.
  • Revision ID: martin.packman@canonical.com-20111006164145-o98oqn32440extgt
Merge 2.4 into dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
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,))