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-07 09:06:36 +0000 |
commit | d08397ba4d1331993300eacbb2f78fcfef19c1cf (patch) | |
tree | 374d8aa46a69fbae08d2b3e8e7456a5c61005e4c /bitbake/lib/bb/fetch2/wget.py | |
parent | f6eefb3ca3bb2a5ea0ec1364bdb0bc41ae58c815 (diff) | |
download | poky-d08397ba4d1331993300eacbb2f78fcfef19c1cf.tar.gz |
bitbake/fetch2: Rewrite and improve exception handling, reusing core functions for common operations where possible
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/fetch2/wget.py')
-rw-r--r-- | bitbake/lib/bb/fetch2/wget.py | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/bitbake/lib/bb/fetch2/wget.py b/bitbake/lib/bb/fetch2/wget.py index 8d623721a9..e33265e1cc 100644 --- a/bitbake/lib/bb/fetch2/wget.py +++ b/bitbake/lib/bb/fetch2/wget.py | |||
@@ -72,20 +72,15 @@ class Wget(Fetch): | |||
72 | # Sanity check since wget can pretend it succeed when it didn't | 72 | # Sanity check since wget can pretend it succeed when it didn't |
73 | # Also, this used to happen if sourceforge sent us to the mirror page | 73 | # Also, this used to happen if sourceforge sent us to the mirror page |
74 | if not os.path.exists(ud.localpath) and not checkonly: | 74 | if not os.path.exists(ud.localpath) and not checkonly: |
75 | logger.debug(2, "The fetch command for %s returned success but %s doesn't exist?...", uri, ud.localpath) | 75 | raise FetchError("The fetch command returned success but %s doesn't exist?!" % (uri, ud.localpath), uri) |
76 | return False | ||
77 | |||
78 | return True | ||
79 | 76 | ||
80 | localdata = data.createCopy(d) | 77 | localdata = data.createCopy(d) |
81 | data.setVar('OVERRIDES', "wget:" + data.getVar('OVERRIDES', localdata), localdata) | 78 | data.setVar('OVERRIDES', "wget:" + data.getVar('OVERRIDES', localdata), localdata) |
82 | data.update_data(localdata) | 79 | data.update_data(localdata) |
83 | 80 | ||
84 | if fetch_uri(uri, ud, localdata): | 81 | fetch_uri(uri, ud, localdata) |
85 | return True | 82 | |
86 | 83 | return True | |
87 | raise FetchError(uri) | ||
88 | |||
89 | 84 | ||
90 | def checkstatus(self, uri, ud, d): | 85 | def checkstatus(self, uri, ud, d): |
91 | return self.download(uri, ud, d, True) | 86 | return self.download(uri, ud, d, True) |