| Message ID | 20240205164619.3086698-1-pkj@axis.com |
|---|---|
| State | New |
| Headers | show |
| Series | bitbake-diffsigs: Support tasks with dependencies correctly again | expand |
see https://lists.openembedded.org/g/bitbake-devel/message/15824 :) On Mon, Feb 5, 2024 at 5:46 PM Peter Kjellerstedt < peter.kjellerstedt@axis.com> wrote: > This was missed in commit 5439aca056c84ab4410aaf24bdb68e896191d8e1 that > adapted the code to the changes made to find_siginfo(), which now > returns a dict for each file rather than just the filename. > > Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> > --- > bitbake/bin/bitbake-diffsigs | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/bitbake/bin/bitbake-diffsigs b/bitbake/bin/bitbake-diffsigs > index a8f49191b0..8202c78623 100755 > --- a/bitbake/bin/bitbake-diffsigs > +++ b/bitbake/bin/bitbake-diffsigs > @@ -99,7 +99,7 @@ def recursecb(key, hash1, hash2): > elif hash2 not in hashfiles: > recout.append("Unable to find matching sigdata for %s with hash > %s" % (key, hash2)) > else: > - out2 = bb.siggen.compare_sigfiles(hashfiles[hash1], > hashfiles[hash2], recursecb, color=color) > + out2 = bb.siggen.compare_sigfiles(hashfiles[hash1]['path'], > hashfiles[hash2]['path'], recursecb, color=color) > for change in out2: > for line in change.splitlines(): > recout.append(' ' + line) > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#194955): > https://lists.openembedded.org/g/openembedded-core/message/194955 > Mute This Topic: https://lists.openembedded.org/mt/104179998/3617156 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ > martin.jansa@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- > >
diff --git a/bitbake/bin/bitbake-diffsigs b/bitbake/bin/bitbake-diffsigs index a8f49191b0..8202c78623 100755 --- a/bitbake/bin/bitbake-diffsigs +++ b/bitbake/bin/bitbake-diffsigs @@ -99,7 +99,7 @@ def recursecb(key, hash1, hash2): elif hash2 not in hashfiles: recout.append("Unable to find matching sigdata for %s with hash %s" % (key, hash2)) else: - out2 = bb.siggen.compare_sigfiles(hashfiles[hash1], hashfiles[hash2], recursecb, color=color) + out2 = bb.siggen.compare_sigfiles(hashfiles[hash1]['path'], hashfiles[hash2]['path'], recursecb, color=color) for change in out2: for line in change.splitlines(): recout.append(' ' + line)
This was missed in commit 5439aca056c84ab4410aaf24bdb68e896191d8e1 that adapted the code to the changes made to find_siginfo(), which now returns a dict for each file rather than just the filename. Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> --- bitbake/bin/bitbake-diffsigs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)