diff options
Diffstat (limited to 'bitbake/lib/bb/fetch2/osc.py')
-rw-r--r-- | bitbake/lib/bb/fetch2/osc.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bitbake/lib/bb/fetch2/osc.py b/bitbake/lib/bb/fetch2/osc.py index 2b4f7d9c13..6c60456b53 100644 --- a/bitbake/lib/bb/fetch2/osc.py +++ b/bitbake/lib/bb/fetch2/osc.py | |||
@@ -32,8 +32,9 @@ class Osc(FetchMethod): | |||
32 | ud.module = ud.parm["module"] | 32 | ud.module = ud.parm["module"] |
33 | 33 | ||
34 | # Create paths to osc checkouts | 34 | # Create paths to osc checkouts |
35 | oscdir = d.getVar("OSCDIR") or (d.getVar("DL_DIR") + "/osc") | ||
35 | relpath = self._strip_leading_slashes(ud.path) | 36 | relpath = self._strip_leading_slashes(ud.path) |
36 | ud.pkgdir = os.path.join(d.getVar('OSCDIR'), ud.host) | 37 | ud.pkgdir = os.path.join(oscdir, ud.host) |
37 | ud.moddir = os.path.join(ud.pkgdir, relpath, ud.module) | 38 | ud.moddir = os.path.join(ud.pkgdir, relpath, ud.module) |
38 | 39 | ||
39 | if 'rev' in ud.parm: | 40 | if 'rev' in ud.parm: |
@@ -54,7 +55,7 @@ class Osc(FetchMethod): | |||
54 | command is "fetch", "update", "info" | 55 | command is "fetch", "update", "info" |
55 | """ | 56 | """ |
56 | 57 | ||
57 | basecmd = d.expand('${FETCHCMD_osc}') | 58 | basecmd = d.getVar("FETCHCMD_osc") or "/usr/bin/env osc" |
58 | 59 | ||
59 | proto = ud.parm.get('protocol', 'ocs') | 60 | proto = ud.parm.get('protocol', 'ocs') |
60 | 61 | ||