summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-20 12:58:04 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-21 13:10:33 +0100
commit548465141a6e34972b3ba440cab9c5106a82d7ca (patch)
tree0c118dfc5e4cc6fe4410038514369546445601d8 /bitbake/lib/bb
parent83bbfa07ab49547da9ffcdcf924cc585932eee5a (diff)
downloadpoky-548465141a6e34972b3ba440cab9c5106a82d7ca.tar.gz
bitbake: fetch2: uri_replace() improve mirrortarball handling
We only consider mirror tarballs when the source and target urls are of differing types. We also should clear all url paramters when handling mirror tarballs. (From Poky rev: da140b8b0b3dda5429f9eee68829ef5247cdfe12) (Bitbake rev: 7619dcad29a6c2405b15a8fbadfa11e81b399ae1) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/fetch2/__init__.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
index baf668d9a5..f81b845e4d 100644
--- a/bitbake/lib/bb/fetch2/__init__.py
+++ b/bitbake/lib/bb/fetch2/__init__.py
@@ -212,8 +212,11 @@ def uri_replace(ud, uri_find, uri_replace, d):
212 if loc == 2: 212 if loc == 2:
213 # Handle path manipulations 213 # Handle path manipulations
214 basename = None 214 basename = None
215 if ud.mirrortarball: 215 if uri_decoded[0] != uri_replace_decoded[0] and ud.mirrortarball:
216 # If the source and destination url types differ, must be a mirrortarball mapping
216 basename = os.path.basename(ud.mirrortarball) 217 basename = os.path.basename(ud.mirrortarball)
218 # Kill parameters, they make no sense for mirror tarballs
219 uri_decoded[5] = {}
217 elif ud.localpath: 220 elif ud.localpath:
218 basename = os.path.basename(ud.localpath) 221 basename = os.path.basename(ud.localpath)
219 if basename and not result_decoded[loc].endswith(basename): 222 if basename and not result_decoded[loc].endswith(basename):