← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/config.py

  • Committer: Vincent Ladeuil
  • Date: 2010-06-17 09:23:19 UTC
  • mfrom: (5301 +trunk)
  • mto: (5247.1.8 first-try)
  • mto: This revision was merged to the branch mainline in revision 5326.
  • Revision ID: v.ladeuil+lp@free.fr-20100617092319-da2bzdtf3j0voynf
Merge bzr.dev into cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/config.py
843
843
                                  ' or HOME set')
844
844
        return osutils.pathjoin(base, 'bazaar', '2.0')
845
845
    else:
846
 
        # cygwin, linux, and darwin all have a $HOME directory
847
846
        if base is None:
848
847
            base = os.path.expanduser("~")
849
848
        return osutils.pathjoin(base, ".bazaar")