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/perforce.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/perforce.py')
| -rw-r--r-- | bitbake/lib/bb/fetch/perforce.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/bitbake/lib/bb/fetch/perforce.py b/bitbake/lib/bb/fetch/perforce.py index bdd23deef5..222ed7eaaa 100644 --- a/bitbake/lib/bb/fetch/perforce.py +++ b/bitbake/lib/bb/fetch/perforce.py | |||
| @@ -133,10 +133,7 @@ class Perforce(Fetch): | |||
| 133 | else: | 133 | else: |
| 134 | path = depot | 134 | path = depot |
| 135 | 135 | ||
| 136 | if "module" in parm: | 136 | module = parm.get('module', os.path.basename(path)) |
| 137 | module = parm["module"] | ||
| 138 | else: | ||
| 139 | module = os.path.basename(path) | ||
| 140 | 137 | ||
| 141 | localdata = data.createCopy(d) | 138 | localdata = data.createCopy(d) |
| 142 | data.setVar('OVERRIDES', "p4:%s" % data.getVar('OVERRIDES', localdata), localdata) | 139 | data.setVar('OVERRIDES', "p4:%s" % data.getVar('OVERRIDES', localdata), localdata) |
| @@ -206,4 +203,4 @@ class Perforce(Fetch): | |||
| 206 | pass | 203 | pass |
| 207 | raise FetchError(module) | 204 | raise FetchError(module) |
| 208 | # cleanup | 205 | # cleanup |
| 209 | os.system('rm -rf %s' % tmpfile) | 206 | bb.utils.prunedir(tmpfile) |
