diff options
Diffstat (limited to 'bitbake/lib/bb/fetch2/bzr.py')
-rw-r--r-- | bitbake/lib/bb/fetch2/bzr.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bitbake/lib/bb/fetch2/bzr.py b/bitbake/lib/bb/fetch2/bzr.py index 16123f8af9..658502f9a6 100644 --- a/bitbake/lib/bb/fetch2/bzr.py +++ b/bitbake/lib/bb/fetch2/bzr.py | |||
@@ -41,8 +41,9 @@ class Bzr(FetchMethod): | |||
41 | init bzr specific variable within url data | 41 | init bzr specific variable within url data |
42 | """ | 42 | """ |
43 | # Create paths to bzr checkouts | 43 | # Create paths to bzr checkouts |
44 | bzrdir = d.getVar("BZRDIR") or (d.getVar("DL_DIR") + "/bzr") | ||
44 | relpath = self._strip_leading_slashes(ud.path) | 45 | relpath = self._strip_leading_slashes(ud.path) |
45 | ud.pkgdir = os.path.join(d.expand('${BZRDIR}'), ud.host, relpath) | 46 | ud.pkgdir = os.path.join(bzrdir, ud.host, relpath) |
46 | 47 | ||
47 | ud.setup_revisions(d) | 48 | ud.setup_revisions(d) |
48 | 49 | ||
@@ -57,7 +58,7 @@ class Bzr(FetchMethod): | |||
57 | command is "fetch", "update", "revno" | 58 | command is "fetch", "update", "revno" |
58 | """ | 59 | """ |
59 | 60 | ||
60 | basecmd = d.expand('${FETCHCMD_bzr}') | 61 | basecmd = d.getVar("FETCHCMD_bzr") or "/usr/bin/env bzr" |
61 | 62 | ||
62 | proto = ud.parm.get('protocol', 'http') | 63 | proto = ud.parm.get('protocol', 'http') |
63 | 64 | ||