]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
bitbake: fetcher2: clean(): remove the .patch.done
authorRobert Yang <liezhi.yang@windriver.com>
Fri, 27 Dec 2013 06:51:51 +0000 (01:51 -0500)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 2 Jan 2014 13:07:49 +0000 (13:07 +0000)
There was a problem:

$ bitbake xf86-video-omapfb -cfetch && bitbake xf86-video-omapfb -ccleanall

Everything should be removed, but the
0006-omapfb-port-to-new-xserver-video-API.patch.done still exists in the
DL_DIR, this is because the clean() in the fetch2/__init__.py skips
removing the local file, so that it will skip removing the .done.

The local file (file://) isn't needed to be removed since it is not
downloaded into DL_DIR, but the .done should be removed, this patch will
remove the .done, and it doesn't remove anything else since the clean()
in local.py does nothing.

[YOCTO #5687]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
lib/bb/fetch2/__init__.py

index 439a44a4af6f6a3c6585ba78e836593983a6e089..c584f48ad24401e40c13f8f0dda6eb0eea85653c 100644 (file)
@@ -1497,7 +1497,7 @@ class Fetch(object):
             ud = self.ud[url]
             ud.setup_localpath(self.d)
 
-            if not ud.localfile or self.localpath is None:
+            if not ud.localfile and ud.localpath is None:
                 continue
 
             if ud.lockfile: