From 7b6db199fabafa8c20156ebf0fd375d430fab05b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 23 Oct 2010 00:22:54 +0100 Subject: bitbake/fetch: When fetchers return errors, ensure any partial download is cleared Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch/__init__.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/bitbake/lib/bb/fetch/__init__.py b/bitbake/lib/bb/fetch/__init__.py index 9e425cb785..8cf44d88f4 100644 --- a/bitbake/lib/bb/fetch/__init__.py +++ b/bitbake/lib/bb/fetch/__init__.py @@ -225,6 +225,12 @@ def init(urls, d, setup = True): def mirror_from_string(data): return [ i.split() for i in (data or "").replace('\\n','\n').split('\n') if i ] +def removefile(f): + try: + os.remove(f) + except: + pass + def go(d, urls = None): """ Fetch all urls @@ -258,6 +264,8 @@ def go(d, urls = None): m.go(u, ud, d) localpath = ud.localpath except FetchError: + # Remove any incomplete file + removefile(ud.localpath) # Finally, try fetching uri, u, from MIRRORS mirrors = mirror_from_string(bb.data.getVar('MIRRORS', d, True)) localpath = try_mirrors (d, u, mirrors) @@ -470,6 +478,7 @@ def try_mirrors(d, uri, mirrors, check = False, force = False): import sys (type, value, traceback) = sys.exc_info() bb.msg.debug(2, bb.msg.domain.Fetcher, "Mirror fetch failure: %s" % value) + removefile(ud.localpath) continue return None -- cgit v1.2.3-54-g00ecf