diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2017-10-02 14:55:37 +1300 |
|---|---|---|
| committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2017-11-03 16:14:14 +1300 |
| commit | 7e391bf8df107c186a729105ddc62df4eea87d0b (patch) | |
| tree | 1774125b5d88197cdcb3932bd97faa7f1969e9c4 | |
| parent | 3b413a80578caacd9a7f405f3c51a3921d78a60d (diff) | |
| download | openembedded-core-contrib-7e391bf8df107c186a729105ddc62df4eea87d0b.tar.gz | |
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@linux.intel.com>
| -rw-r--r-- | meta/lib/oe/sstatesig.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index 5a4093266d..3a8778eae0 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', '*') |