bitbake/fetch2: Rewrite and improve exception handling, reusing core functions for common operations where possible

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 4 insertions, 9 deletions

diff --git a/bitbake/lib/bb/fetch2/wget.py b/bitbake/lib/bb/fetch2/wget.py
index 8d62372..e33265e 100644
--- a/bitbake/lib/bb/fetch2/wget.py
+++ b/bitbake/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)