~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/config.py

  • Committer: John Arbash Meinel
  • Date: 2006-06-18 02:21:57 UTC
  • mfrom: (1787 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1794.
  • Revision ID: john@arbash-meinel.com-20060618022157-6e33aa9b67c25e4f
[merge] bzr.dev 1787

Show diffs side-by-side

added added

removed removed

Lines of Context:
255
255
            return self._string_to_signature_policy(policy)
256
256
 
257
257
    def _get_signing_policy(self):
258
 
        """See Config._get_signing_policy"""
 
258
        """See Config._get_signature_checking."""
259
259
        policy = self._get_user_option('create_signatures')
260
260
        if policy:
261
261
            return self._string_to_signing_policy(policy)
541
541
        if base is None:
542
542
            base = os.environ.get('HOME', None)
543
543
        if base is None:
544
 
            raise errors.BzrError('You must have one of BZR_HOME, APPDATA, or HOME set')
 
544
            raise BzrError('You must have one of BZR_HOME, APPDATA, or HOME set')
545
545
        return pathjoin(base, 'bazaar', '2.0')
546
546
    else:
547
547
        # cygwin, linux, and darwin all have a $HOME directory