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

PR#1702: fix log message to show package name

Browse source 
Merges #1702
https://pagure.io/koji/pull-request/1702

Fixes: #1693
https://pagure.io/koji/issue/1693
host.tagBuild returns incorrect error message for not listed package
This commit is contained in:
Tomas Kopecek 2019-10-16 09:20:55 +02:00
commit 17a26ab27f
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
hub/kojihub.py
View file

@ -13293,7 +13293,8 @@ class HostExports(object):
host.verify()
task = Task(task_id)
task.assertHost(host.id)
pkg_id = get_build(build, strict=True)['package_id']
build = get_build(build, strict=True)
pkg_id = build['package_id']
tag_id = get_tag(tag, strict=True)['id']
user_id = task.getOwner()
policy_data = {'tag' : tag, 'build' : build, 'fromtag' : fromtag}
@ -13310,9 +13311,9 @@ class HostExports(object):
pkgs = readPackageList(tagID=tag_id, pkgID=pkg_id, inherit=True)
pkg_error = None
if pkg_id not in pkgs:
pkg_error = "Package %s not in list for %s" % (build, tag)
pkg_error = "Package %s not in list for %s" % (build['name'], tag)
elif pkgs[pkg_id]['blocked']:
pkg_error = "Package %s blocked in %s" % (build, tag)
pkg_error = "Package %s blocked in %s" % (build['name'], tag)
if pkg_error:
if force and context.session.hasPerm('admin'):
pkglist_add(tag_id, pkg_id, force=True, block=False)