diff options
Diffstat (limited to 'meta/lib/oe/buildhistory_analysis.py')
| -rw-r--r-- | meta/lib/oe/buildhistory_analysis.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/lib/oe/buildhistory_analysis.py b/meta/lib/oe/buildhistory_analysis.py index 2d6fa1779e..4edad01580 100644 --- a/meta/lib/oe/buildhistory_analysis.py +++ b/meta/lib/oe/buildhistory_analysis.py @@ -373,8 +373,10 @@ def compare_file_lists(alines, blines, compare_ownership=True): removals.remove(removal2) continue filechanges.append(FileChange(removal, FileChange.changetype_move, addition)) - additions.remove(addition) - removals.remove(removal) + if addition in additions: + additions.remove(addition) + if removal in removals: + removals.remove(removal) for rename in renames: filechanges.append(FileChange(renames[rename], FileChange.changetype_move, rename)) @@ -560,7 +562,7 @@ def compare_siglists(a_blob, b_blob, taskdiff=False): elif not hash2 in hashfiles: out.append("Unable to find matching sigdata for %s with hash %s" % (desc, hash2)) else: - out2 = bb.siggen.compare_sigfiles(hashfiles[hash1], hashfiles[hash2], recursecb, collapsed=True) + out2 = bb.siggen.compare_sigfiles(hashfiles[hash1]['path'], hashfiles[hash2]['path'], recursecb, collapsed=True) for line in out2: m = hashlib.sha256() m.update(line.encode('utf-8')) |