← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/codehosting/__init__.py

  • Committer: Michael Hudson
  • Date: 2009-07-24 03:39:09 UTC
  • mto: This revision was merged to the branch mainline in revision 8993.
  • Revision ID: michael.hudson@canonical.com-20090724033909-gzlah2tlf101ih1l
this seems to help testing against bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/codehosting/__init__.py
36
36
 
37
37
def get_bzr_path():
38
38
    """Find the path to the copy of Bazaar for this rocketfuel instance"""
39
 
    return os.path.join(
 
39
    bzr_in_egg_path = os.path.join(
40
40
        os.path.dirname(os.path.dirname(bzrlib.__file__)),
41
41
        'EGG-INFO/scripts/bzr')
 
42
    if os.path.exists(bzr_in_egg_path):
 
43
        return bzr_in_egg_path
 
44
    else:
 
45
        return os.path.join(
 
46
            os.path.dirname(os.path.dirname(bzrlib.__file__)),
 
47
            'bzr')
42
48
 
43
49
 
44
50
def get_bzr_plugins_path():