system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-22 02:35:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

find-backports: fix selecting backport candidates in find-backports

Browse source 
Due to a bug we would wrongly skip over patches that should
be backported. Fix it.
This commit is contained in:
Thomas Haller 2020-08-14 16:56:19 +02:00
parent eee82e0481
commit 6ac3431827
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
contrib/rh-utils/find-backports
View file

@ -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