mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 01:19:52 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
(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 e4f8c7f693
commit bdb918f808
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/bb/fetch2/__init__.py
+4 -2
View File
@@ -200,8 +200,10 @@ def uri_replace(ud, uri_find, uri_replace, d):
if basename and not result_decoded[loc].endswith(basename): if basename and not result_decoded[loc].endswith(basename):
result_decoded[loc] = os.path.join(result_decoded[loc], basename) result_decoded[loc] = os.path.join(result_decoded[loc], basename)
else: else:
return ud.url return None
result = encodeurl(result_decoded) result = encodeurl(result_decoded)
if result == ud.url:
return None
logger.debug(2, "For url %s returning %s" % (ud.url, result)) logger.debug(2, "For url %s returning %s" % (ud.url, result))
return result return result
@@ -462,7 +464,7 @@ def try_mirrors(d, origud, mirrors, check = False):
except ValueError: except ValueError:
continue continue
newuri = uri_replace(origud, find, replace, ld) newuri = uri_replace(origud, find, replace, ld)
if newuri == origud.url: if not newuri:
continue continue
try: try:
ud = FetchData(newuri, ld) ud = FetchData(newuri, ld)