From 98df63020d963d6ff606db77aae7542a4e5f5291 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 29 Oct 2020 15:21:35 +0000 Subject: scripts/buildhistory_analysis: Avoid tracebacks from file comparision code We're seeing tracebacks from buildhistory analysing the python 3.8 -> 3.9 upgrade due to the significant file renames. Avoid these by checking before removal as they can happen multiple times. (From OE-Core rev: b1eb390bbcb995c0da70478e17f9170721c75341) Signed-off-by: Richard Purdie --- meta/lib/oe/buildhistory_analysis.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/lib/oe/buildhistory_analysis.py b/meta/lib/oe/buildhistory_analysis.py index 2d6fa1779e..b1856846b6 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)) -- cgit v1.2.3-54-g00ecf