← Back to branch summary

~jelmer/ubuntu/maverick/bzr/2.2.5

« back to all changes in this revision

Viewing changes to bzrlib/version.py

  • Committer: Bazaar Package Importer
  • Author(s): Jelmer Vernooij
  • Date: 2009-03-10 14:11:59 UTC
  • mfrom: (1.2.1 upstream) (3.1.68 jaunty)
  • Revision ID: james.westby@ubuntu.com-20090310141159-lwzzo5c1fwrtzgj4
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/version.py
72
72
    if show_config:
73
73
        config_dir = os.path.normpath(config.config_dir())  # use native slashes
74
74
        if not isinstance(config_dir, unicode):
75
 
            config_dir = config_dir.decode(bzrlib.user_encoding)
 
75
            config_dir = config_dir.decode(osutils.get_user_encoding())
76
76
        to_file.write("  Bazaar configuration: %s\n" % (config_dir,))
77
77
        to_file.write("  Bazaar log file: ")
78
78
        to_file.write(trace._bzr_log_filename + '\n')