diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-20 12:37:36 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-21 11:35:07 +0100 |
| commit | 729b396b2160367f38443d1a64e6e8bbaffc1c35 (patch) | |
| tree | 4d7a1b29d9f4d6c886a49a0e461100f771e8dda3 /bitbake | |
| parent | bdb918f80813c1809032beb1eac2e2ef134dd2f6 (diff) | |
| download | poky-729b396b2160367f38443d1a64e6e8bbaffc1c35.tar.gz | |
bitbake: fetch2: Fix error handling in uri_replace()
(From Poky rev: 1bfba28a583cb167f60e05ecdf34d0786dc1eec5)
(Bitbake rev: aa7467a764ddcbc7d65af99e88cf093b6ec6d24e)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
| -rw-r--r-- | bitbake/lib/bb/fetch2/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index 6789f3f9a5..a26f61eb42 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py | |||
| @@ -174,7 +174,8 @@ def encodeurl(decoded): | |||
| 174 | 174 | ||
| 175 | def uri_replace(ud, uri_find, uri_replace, d): | 175 | def uri_replace(ud, uri_find, uri_replace, d): |
| 176 | if not ud.url or not uri_find or not uri_replace: | 176 | if not ud.url or not uri_find or not uri_replace: |
| 177 | logger.debug(1, "uri_replace: passed an undefined value, not replacing") | 177 | logger.error("uri_replace: passed an undefined value, not replacing") |
| 178 | return None | ||
| 178 | uri_decoded = list(decodeurl(ud.url)) | 179 | uri_decoded = list(decodeurl(ud.url)) |
| 179 | uri_find_decoded = list(decodeurl(uri_find)) | 180 | uri_find_decoded = list(decodeurl(uri_find)) |
| 180 | uri_replace_decoded = list(decodeurl(uri_replace)) | 181 | uri_replace_decoded = list(decodeurl(uri_replace)) |