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

cli: return error if add/remove-tag-inheritance can't be applied

Browse source 
Fixes: https://pagure.io/koji/issue/2604
This commit is contained in:
Tomas Kopecek 2020-12-15 16:12:21 +01:00
parent 9927cc142c
commit ae6d61a15f
1 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

24
cli/koji_cli/commands.py
View file

@ -5176,15 +5176,13 @@ def handle_add_tag_inheritance(goptions, session, args):
samePriority = [datum for datum in inheritanceData if datum['priority'] == priority]
if sameParents and not options.force:
print(_("Error: You are attempting to add %s as %s's parent even though it already is "
"%s's parent.")
% (parent['name'], tag['name'], tag['name']))
print(_("Please use --force if this is what you really want to do."))
return
warn(_("Error: You are attempting to add %s as %s's parent even though it already is "
"%s's parent.")
% (parent['name'], tag['name'], tag['name']))
error(_("Please use --force if this is what you really want to do."))
if samePriority:
print(_("Error: There is already an active inheritance with that priority on %s, "
error(_("Error: There is already an active inheritance with that priority on %s, "
"please specify a different priority with --priority." % tag['name']))
return
new_data = {}
new_data['parent_id'] = parent['id']
@ -5317,18 +5315,14 @@ def handle_remove_tag_inheritance(goptions, session, args):
data = [datum for datum in data if datum['priority'] == priority]
if len(data) == 0:
print(_("No inheritance link found to remove. Please check your arguments"))
return
error(_("No inheritance link found to remove. Please check your arguments"))
elif len(data) > 1:
print(_("Multiple matches for tag."))
if not parent:
print(_("Please specify a parent on the command line."))
return
error(_("Please specify a parent on the command line."))
if not priority:
print(_("Please specify a priority on the command line."))
return
print(_("Error: Key constraints may be broken. Exiting."))
return
error(_("Please specify a priority on the command line."))
error(_("Error: Key constraints may be broken. Exiting."))
# len(data) == 1
data = data[0]