bitbake/fetch2: Ensure we only remove files, not directories when fetch failures occur

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2011-02-08 12:42:24 +00:00
parent 0713fb6b99
commit 91eeb9b0d3
1 changed files with 5 additions and 3 deletions

View File

@ -431,7 +431,8 @@ def try_mirrors(d, origud, mirrors, check = False):
except bb.fetch2.BBFetchException:
logger.debug(1, "Mirror fetch failure for url %s (original url: %s)" % (newuri, origud.url))
bb.utils.remove(ud.localpath)
if os.path.isfile(ud.localpath):
bb.utils.remove(ud.localpath)
continue
return None
@ -850,8 +851,9 @@ class Fetch(object):
localpath = ud.localpath
except BBFetchException:
# Remove any incomplete file
bb.utils.remove(ud.localpath)
# Remove any incomplete fetch
if os.path.isfile(ud.localpath):
bb.utils.remove(ud.localpath)
mirrors = mirror_from_string(bb.data.getVar('MIRRORS', self.d, True))
localpath = try_mirrors (self.d, ud, mirrors)