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 | openembedded-core-4df0d6adcaae5382009c356d750e7909a44284f6.tar.gz openembedded-core-4df0d6adcaae5382009c356d750e7909a44284f6.tar.bz2 openembedded-core-4df0d6adcaae5382009c356d750e7909a44284f6.tar.xz openembedded-core-4df0d6adcaae5382009c356d750e7909a44284f6.zip | |
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 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) |