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

(From Poky rev: 91eeb9b0d334275ff2730e55e86fd351e1b652ef)

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

diff --git a/lib/bb/fetch2/__init__.py b/lib/bb/fetch2/__init__.py
index 5a002875861351b90579312795604f0becce725e..89f5930b7f8816bb141c5dc13b5540ff1718b7ff 100644 (file)
--- a/lib/bb/fetch2/__init__.py
+++ b/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)