[oe-commits] [openembedded-core] 35/122: lib/oe/sstatesig: fix wildcard matching wrong task signature files

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch rocko
in repository openembedded-core.

commit 8565391a4ebb574141b5d09bff710fc02c73ba34
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
AuthorDate: Fri Nov 3 16:16:10 2017 +1300

    lib/oe/sstatesig: fix wildcard matching wrong task signature files
    
    With a '*' as a wildcard for the signature here we can also match a
    portion of the task name with the result that we may match a sigdata
    file for the wrong task. Luckily the signature is always the same
    length - 32 characters - so we can simply use 32 '?' characters instead.
    (A regex would have been another alternative, but the wildcard should be
    effective and I felt like a regex would complicate the code more than
    this solution).
    
    Fixes [YOCTO #11763].
    
    Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    Signed-off-by: Armin Kuster <akuster at mvista.com>
---
 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 5a40932..3a8778e 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -320,7 +320,7 @@ def find_siginfo(pn, taskname, taskhashlist, d):
 
     if not taskhashlist or (len(filedates) < 2 and not foundall):
         # That didn't work, look in sstate-cache
-        hashes = taskhashlist or ['*']
+        hashes = taskhashlist or ['?' * 32]
         localdata = bb.data.createCopy(d)
         for hashval in hashes:
             localdata.setVar('PACKAGE_ARCH', '*')

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.