From 91eeb9b0d334275ff2730e55e86fd351e1b652ef Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 8 Feb 2011 12:42:24 +0000 Subject: bitbake/fetch2: Ensure we only remove files, not directories when fetch failures occur Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch2/__init__.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index 5a00287586..89f5930b7f 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py @@ -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) -- cgit v1.2.3-54-g00ecf