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 a32d0b0a29..26820967a3 100644 --- a/bitbake/lib/bb/fetch/osc.py +++ b/bitbake/lib/bb/fetch/osc.py | |||
@@ -59,9 +59,7 @@ class Osc(Fetch): | |||
59 | 59 | ||
60 | basecmd = data.expand('${FETCHCMD_osc}', d) | 60 | basecmd = data.expand('${FETCHCMD_osc}', d) |
61 | 61 | ||
62 | proto = "ocs" | 62 | proto = ud.parm.get('proto', 'ocs') |
63 | if "proto" in ud.parm: | ||
64 | proto = ud.parm["proto"] | ||
65 | 63 | ||
66 | options = [] | 64 | options = [] |
67 | 65 | ||
@@ -124,7 +122,7 @@ class Osc(Fetch): | |||
124 | Generate a .oscrc to be used for this run. | 122 | Generate a .oscrc to be used for this run. |
125 | """ | 123 | """ |
126 | 124 | ||
127 | config_path = "%s/oscrc" % data.expand('${OSCDIR}', d) | 125 | config_path = os.path.join(data.expand('${OSCDIR}', d), "oscrc") |
128 | if (os.path.exists(config_path)): | 126 | if (os.path.exists(config_path)): |
129 | os.remove(config_path) | 127 | os.remove(config_path) |
130 | 128 | ||