Patchwork sstatesig: Ensure we return all matches for find_sigdata

login
register
mail settings
Submitter Richard Purdie
Date Dec. 19, 2013, 9:38 a.m.
Message ID <1387445898.6402.62.camel@ted>
Download mbox | patch
Permalink /patch/63575/
State Accepted
Commit b6b6d923a6f81c96590d091cd9eebd1bd2031045
Headers show

Comments

Richard Purdie - Dec. 19, 2013, 9:38 a.m.
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.

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

Patch

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)