diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-04 10:26:21 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-10 23:37:00 +0000 |
commit | d0ffe023c4a642c8d1c188ec499870e7a7113d7d (patch) | |
tree | 5d22edd49e9e733643c73959bbbebee55d3df089 /lib/bb/fetch2/wget.py | |
parent | e448fa0432d12cc54f0b540fe2cacff37135c9ed (diff) | |
download | bitbake-d0ffe023c4a642c8d1c188ec499870e7a7113d7d.tar.gz |
bitbake/fetch2: Rewrite and improve exception handling, reusing core functions for common operations where possible
(From Poky rev: d08397ba4d1331993300eacbb2f78fcfef19c1cf)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/fetch2/wget.py')
-rw-r--r-- | lib/bb/fetch2/wget.py | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/lib/bb/fetch2/wget.py b/lib/bb/fetch2/wget.py index 8d623721a..e33265e1c 100644 --- a/lib/bb/fetch2/wget.py +++ b/lib/bb/fetch2/wget.py @@ -72,20 +72,15 @@ class Wget(Fetch): # Sanity check since wget can pretend it succeed when it didn't # Also, this used to happen if sourceforge sent us to the mirror page if not os.path.exists(ud.localpath) and not checkonly: - logger.debug(2, "The fetch command for %s returned success but %s doesn't exist?...", uri, ud.localpath) - return False - - return True + raise FetchError("The fetch command returned success but %s doesn't exist?!" % (uri, ud.localpath), uri) localdata = data.createCopy(d) data.setVar('OVERRIDES', "wget:" + data.getVar('OVERRIDES', localdata), localdata) data.update_data(localdata) - if fetch_uri(uri, ud, localdata): - return True - - raise FetchError(uri) - + fetch_uri(uri, ud, localdata) + + return True def checkstatus(self, uri, ud, d): return self.download(uri, ud, d, True) |