From 6ac3431827bb0d143dfd7b354421cac3ee1532a7 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 14 Aug 2020 16:56:19 +0200 Subject: [PATCH] find-backports: fix selecting backport candidates in find-backports Due to a bug we would wrongly skip over patches that should be backported. Fix it. --- contrib/rh-utils/find-backports | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/contrib/rh-utils/find-backports b/contrib/rh-utils/find-backports index 96991ae48d..6cb62dcea6 100755 --- a/contrib/rh-utils/find-backports +++ b/contrib/rh-utils/find-backports @@ -274,6 +274,12 @@ if __name__ == "__main__": else: l.append(c) + own_commits_cherry_picked_flat = set() + for c, p in own_commits_cherry_picked.items(): + own_commits_cherry_picked_flat.add(c) + if p: + own_commits_cherry_picked_flat.update(p) + # print(">>> own_commits_cherry_picked") # pp.pprint(own_commits_cherry_picked) @@ -295,10 +301,10 @@ if __name__ == "__main__": # print(">>> in cherry_picks_all") continue for f in fixes: - if f not in own_commits_cherry_picked: - # commit "c" fixes commit "f", but this is one one of our own commits + if f not in own_commits_cherry_picked_flat: + # commit "c" fixes commit "f", but this is not one of our own commits # and not interesting. - # print(">>> fixes %s in own_commits_cherry_picked" % (f)) + # print(">>> fixes %s not in own_commits_cherry_picked" % (f)) continue # print(">>> take %s (fixes %s)" % (c, fixes)) fixing_commits[c] = fixes