particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

clone-tag: avoid marking and then unmarking for deletion

Browse source 
Between this and the last change, the filtering of bdellist is no longer needed
This commit is contained in:
Mike McLean 2020-04-08 12:35:17 -04:00 • committed by Tomas Kopecek
parent 9446861752
commit 0790f98468
1 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
cli/koji_cli/commands.py
View file

@ -3562,10 +3562,11 @@ def handle_clone_tag(goptions, session, args):
pdellist.sort(key=lambda x: x['package_name'])
baddlist = [] # list containing new builds to be added from src tag
bdellist = [] # list containing new builds to be removed from dst tag
# remove builds for packages that are absent from src tag
for (pkg, dstblds) in six.iteritems(dstbldsbypkg):
if pkg not in srcbldsbypkg:
bdellist.extend(dstblds.values())
if options.delete:
# remove builds for packages that are absent from src tag
for (pkg, dstblds) in six.iteritems(dstbldsbypkg):
if pkg not in srcbldsbypkg:
bdellist.extend(dstblds.values())
# add and/or remove builds from dst to match src contents and order
for (pkg, srcblds) in six.iteritems(srcbldsbypkg):
dstblds = dstbldsbypkg[pkg]
@ -3623,12 +3624,6 @@ def handle_clone_tag(goptions, session, args):
baddlist.sort(key=lambda x: x['package_name'])
bdellist.sort(key=lambda x: x['package_name'])
if not options.delete:
# even in such case we need to delete out of order builds
# to be retagged correctly later
add_ids = [x['id'] for x in baddlist]
bdellist = [x for x in bdellist if x['id'] in add_ids]
gaddlist = [] # list containing new groups to be added from src tag
for (grpname, group) in six.iteritems(srcgroups):
if grpname not in dstgroups: