← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/config.py

  • Committer: John Arbash Meinel
  • Date: 2011-01-12 21:28:39 UTC
  • mfrom: (5602 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5605.
  • Revision ID: john@arbash-meinel.com-20110112212839-lfzo8o183tw10gnd
Merge bzr.dev 5602 to, yet again, resolve a NEWS/bzr-2.3.txt conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/config.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005-2011 Canonical Ltd
2
2
#   Authors: Robert Collins <robert.collins@canonical.com>
3
3
#            and others
4
4
#
1131
1131
    """
1132
1132
    base = os.environ.get('BZR_HOME', None)
1133
1133
    if sys.platform == 'win32':
 
1134
        # environ variables on Windows are in user encoding/mbcs. So decode
 
1135
        # before using one
 
1136
        if base is not None:
 
1137
            base = base.decode('mbcs')
1134
1138
        if base is None:
1135
1139
            base = win32utils.get_appdata_location_unicode()
1136
1140
        if base is None:
1137
1141
            base = os.environ.get('HOME', None)
 
1142
            if base is not None:
 
1143
                base = base.decode('mbcs')
1138
1144
        if base is None:
1139
1145
            raise errors.BzrError('You must have one of BZR_HOME, APPDATA,'
1140
1146
                                  ' or HOME set')