From: Richard Purdie Date: Thu, 29 Oct 2020 15:21:35 +0000 (+0000) Subject: scripts/buildhistory_analysis: Avoid tracebacks from file comparision code X-Git-Tag: yocto-3.2.1~84 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=b1eb390bbcb995c0da70478e17f9170721c75341;p=openembedded-core.git 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. Signed-off-by: Richard Purdie --- 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))