diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-20 12:54:46 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-21 13:07:33 +0100 |
| commit | 84ffc261f376429b3a6b5d7bf2f6217cd10ca12a (patch) | |
| tree | db19d879dce47bde2e05f025532570c79472020f /lib | |
| parent | 075296f3e5e5e3662290a888a6ba11229a36b95a (diff) | |
| download | bitbake-84ffc261f376429b3a6b5d7bf2f6217cd10ca12a.tar.gz | |
fetch2: Remove basestring test and simplify uri_replace
(From Poky rev: d5657883d34bfef6beec594ac8d799f617b6b3ad)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bb/fetch2/__init__.py | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py index ce2fb23b4..05ecd3c34 100644 --- a/lib/bb/fetch2/__init__.py +++ b/lib/bb/fetch2/__init__.py @@ -193,24 +193,25 @@ def uri_replace(ud, uri_find, uri_replace, d): result_decoded = ['', '', '', '', '', {}] for loc, i in enumerate(uri_find_decoded): result_decoded[loc] = uri_decoded[loc] - if isinstance(i, basestring): - if (re.match(i, uri_decoded[loc])): - if not uri_replace_decoded[loc]: - result_decoded[loc] = "" - else: - 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) + if loc == 5: + continue + elif (re.match(i, uri_decoded[loc])): + if not uri_replace_decoded[loc]: + result_decoded[loc] = "" 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) if result == ud.url: return None |