[oe-commits] Richard Purdie : sstatesig: Ensure we return all matches for find_sigdata

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 04fc682af7c1657b1c9f37b66a78c4ffc8066e24
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=04fc682af7c1657b1c9f37b66a78c4ffc8066e24

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Thu Dec 19 09:38:18 2013 +0000

sstatesig: Ensure we return all matches for find_sigdata

When the hashes to find isn't specified we need to return matches from both
the sstate cache and the local stamps directory regardless of how many we've
found so far. If we don't do this, we can miss stamps and the comparison is
less accurate/incorrect.

(From OE-Core rev: 08a074e11e2d517b81ca71fd9bda65297bb015a7)

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

---

 meta/lib/oe/sstatesig.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index 329c84d..b13d11c 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -128,7 +128,7 @@ def find_siginfo(pn, taskname, taskhashlist, d):
         else:
             filedates[fullpath] = os.stat(fullpath).st_mtime
 
-    if len(filedates) < 2 and not foundall:
+    if not taskhashlist or (len(filedates) < 2 and not foundall):
         # That didn't work, look in sstate-cache
         hashes = taskhashlist or ['*']
         localdata = bb.data.createCopy(d)