diff options
Diffstat (limited to 'bitbake/lib/bb/fetch/osc.py')
-rw-r--r-- | bitbake/lib/bb/fetch/osc.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/bitbake/lib/bb/fetch/osc.py b/bitbake/lib/bb/fetch/osc.py index a32d0b0a2..26820967a 100644 --- a/bitbake/lib/bb/fetch/osc.py +++ b/bitbake/lib/bb/fetch/osc.py @@ -59,9 +59,7 @@ class Osc(Fetch): basecmd = data.expand('${FETCHCMD_osc}', d) - proto = "ocs" - if "proto" in ud.parm: - proto = ud.parm["proto"] + proto = ud.parm.get('proto', 'ocs') options = [] @@ -124,7 +122,7 @@ class Osc(Fetch): Generate a .oscrc to be used for this run. """ - config_path = "%s/oscrc" % data.expand('${OSCDIR}', d) + config_path = os.path.join(data.expand('${OSCDIR}', d), "oscrc") if (os.path.exists(config_path)): os.remove(config_path) |