← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/version.py

  • Committer: Patch Queue Manager
  • Date: 2011-10-06 08:09:14 UTC
  • mfrom: (6191.1.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20111006080914-364iz1580zxvpxtm
(vila) Merge 2.4 into trunk resolving conflicts (Vincent Ladeuil)

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,))