bitbake: fetch2: Remove basestring test and simplify uri_replace
(From Poky rev: d5657883d34bfef6beec594ac8d799f617b6b3ad) (Bitbake rev: 84ffc261f376429b3a6b5d7bf2f6217cd10ca12a) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
a7d5c57006
commit
bf8501897b
|
@ -193,24 +193,25 @@ def uri_replace(ud, uri_find, uri_replace, d):
|
||||||
result_decoded = ['', '', '', '', '', {}]
|
result_decoded = ['', '', '', '', '', {}]
|
||||||
for loc, i in enumerate(uri_find_decoded):
|
for loc, i in enumerate(uri_find_decoded):
|
||||||
result_decoded[loc] = uri_decoded[loc]
|
result_decoded[loc] = uri_decoded[loc]
|
||||||
if isinstance(i, basestring):
|
if loc == 5:
|
||||||
if (re.match(i, uri_decoded[loc])):
|
continue
|
||||||
if not uri_replace_decoded[loc]:
|
elif (re.match(i, uri_decoded[loc])):
|
||||||
result_decoded[loc] = ""
|
if not uri_replace_decoded[loc]:
|
||||||
else:
|
result_decoded[loc] = ""
|
||||||
result_decoded[loc] = re.sub(i, uri_replace_decoded[loc], uri_decoded[loc])
|
|
||||||
if loc == 2:
|
|
||||||
basename = None
|
|
||||||
if ud.mirrortarball:
|
|
||||||
basename = os.path.basename(ud.mirrortarball)
|
|
||||||
elif ud.localpath:
|
|
||||||
basename = os.path.basename(ud.localpath)
|
|
||||||
if basename and result_decoded[loc].endswith("/"):
|
|
||||||
result_decoded[loc] = os.path.dirname(result_decoded[loc])
|
|
||||||
if basename and not result_decoded[loc].endswith(basename):
|
|
||||||
result_decoded[loc] = os.path.join(result_decoded[loc], basename)
|
|
||||||
else:
|
else:
|
||||||
return None
|
result_decoded[loc] = re.sub(i, uri_replace_decoded[loc], uri_decoded[loc])
|
||||||
|
if loc == 2:
|
||||||
|
basename = None
|
||||||
|
if ud.mirrortarball:
|
||||||
|
basename = os.path.basename(ud.mirrortarball)
|
||||||
|
elif ud.localpath:
|
||||||
|
basename = os.path.basename(ud.localpath)
|
||||||
|
if basename and result_decoded[loc].endswith("/"):
|
||||||
|
result_decoded[loc] = os.path.dirname(result_decoded[loc])
|
||||||
|
if basename and not result_decoded[loc].endswith(basename):
|
||||||
|
result_decoded[loc] = os.path.join(result_decoded[loc], basename)
|
||||||
|
else:
|
||||||
|
return None
|
||||||
result = encodeurl(result_decoded)
|
result = encodeurl(result_decoded)
|
||||||
if result == ud.url:
|
if result == ud.url:
|
||||||
return None
|
return None
|
||||||
|
|
Loading…
Reference in New Issue