diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-14 13:40:28 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-21 13:06:07 +0100 |
commit | eb96609864dec95a516e6e687dd6a2f31d523acf (patch) | |
tree | 79d23ccaeace5e2bf0c549ca1e2aacf9b44be4e3 | |
parent | 2530e0faada5775897cfd1b93aba6925826dca73 (diff) | |
download | bitbake-eb96609864dec95a516e6e687dd6a2f31d523acf.tar.gz |
fetch2/__init__: Make it clearer when uri_replace doesn't return a match
(From Poky rev: dc9976331c5cbb0983adb54f6deb97b9203bacbc)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | lib/bb/fetch2/__init__.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index 324eef28a..73ac73a11 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -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) |