From patchwork Wed Jun 20 14:12:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [bitbake-devel, 01/14] fetch2/__init__: Make it clearer when uri_replace doesn't return a match Date: Wed, 20 Jun 2012 14:12:52 -0000 From: Richard Purdie X-Patchwork-Id: 30297 Message-Id: To: bitbake-devel@lists.openembedded.org Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch2/__init__.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index 324eef2..73ac73a 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/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)