~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/config.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-11-23 16:51:03 UTC
  • mfrom: (3017.1.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20071123165103-6t1a4k7ylgipy76m
Fix #151208: Update configobj to version 4.4.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
84
84
    urlutils,
85
85
    win32utils,
86
86
    )
87
 
import bzrlib.util.configobj.configobj as configobj
 
87
from bzrlib.util.configobj import configobj
88
88
""")
89
89
 
90
90
 
759
759
        if base is None:
760
760
            base = os.environ.get('HOME', None)
761
761
        if base is None:
762
 
            raise errors.BzrError('You must have one of BZR_HOME, APPDATA, or HOME set')
 
762
            raise errors.BzrError('You must have one of BZR_HOME, APPDATA,'
 
763
                                  ' or HOME set')
763
764
        return osutils.pathjoin(base, 'bazaar', '2.0')
764
765
    else:
765
766
        # cygwin, linux, and darwin all have a $HOME directory