diff options
author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2010-11-17 15:40:51 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2011-01-04 14:46:41 +0000 |
commit | 4df0d6adcaae5382009c356d750e7909a44284f6 (patch) | |
tree | d3b8b48e0ded47a63c4ea65b56add754cc750126 /bitbake/lib/bb/fetch/osc.py | |
parent | b7d667f25283cddf8ff4fc9e35425a884a9f527e (diff) | |
download | poky-4df0d6adcaae5382009c356d750e7909a44284f6.tar.gz |
fetch: be more pythonic
no functional changes
(Bitbake rev: e88834fb7c6821cc29c12d296f2edd51f6eb3746)
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
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 | ||