bitbake/fetch2: Remove hardcoded file removal and use clean method

PATCH New Richard Purdie 1 participant 1 message May 13, 2012

Share & tools

Richard Purdie

author

2012-05-13 18:59 UTC #0 lore raw

PATCH 1/1 bitbake/fetch2: Remove hardcoded file removal and use clean method

Under certain circumstances, bitbake could remove files which were outside its control since it unconditionally removes ud.localpath. In the file:// case this can point at external paths.

This patch converts it to use the clean() method which will remove files when its safe to do so but not in the file:// case since the file:// handler has an empty clean method. This means bitbake no longer removes files outside its control and is generally much safer.

Signed-off-by Richard Purdie <[email protected]>

bitbake/lib/bb/fetch2/__init__.py +2 -4

index e5c4b34..8ae8caa 100644
@@ -506,8 +506,7 @@ def try_mirrors(d, origud, mirrors, check = False):
             logger.debug(1, "Mirror fetch failure for url %s (original url: %s)" % (newuri, origud.url))
             logger.debug(1, str(e))
             try:
-                if os.path.isfile(ud.localpath):
-                    bb.utils.remove(ud.localpath)
+                ud.method.clean(ud, ld)
             except UnboundLocalError:
                 pass
             continue

@@ -981,8 +980,7 @@ class Fetch(object):
                         logger.debug(1, str(e))
                         firsterr = e
                         # Remove any incomplete fetch
-                        if os.path.isfile(ud.localpath):
-                            bb.utils.remove(ud.localpath)
+                        m.clean(ud, self.d)
                         logger.debug(1, "Trying MIRRORS")
                         mirrors = mirror_from_string(self.d.getVar('MIRRORS', True))
                         localpath = try_mirrors (self.d, ud, mirrors)