sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

bitbake: fetch2/__init__: Make it clearer when uri_replace doesn't return a match 

(From Poky rev: dc9976331c5cbb0983adb54f6deb97b9203bacbc)

(Bitbake rev: eb96609864dec95a516e6e687dd6a2f31d523acf)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2012-06-14 13:40:28 +00:00
parent c072fa8400
commit 85dc355580
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bitbake/lib/bb/fetch2/__init__.py
View File

@ -210,8 +210,10 @@ def uri_replace(ud, uri_find, uri_replace, d):
if basename and not result_decoded[loc].endswith(basename):
result_decoded[loc] = os.path.join(result_decoded[loc], basename)
else:
return ud.url
return None
result = encodeurl(result_decoded)
if result == ud.url:
return None
logger.debug(2, "For url %s returning %s" % (ud.url, result))
return result
@ -477,7 +479,7 @@ def try_mirrors(d, origud, mirrors, check = False):
except ValueError:
continue
newuri = uri_replace(origud, find, replace, ld)
if newuri == origud.url:
if not newuri:
continue
try:
ud = FetchData(newuri, ld)