[PATCH] display task info for regen-repo command
by Mike McLean
---
cli/koji | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/cli/koji b/cli/koji
index 6556d6f..1d1c34c 100755
--- a/cli/koji
+++ b/cli/koji
@@ -6641,7 +6641,9 @@ def handle_regen_repo(options, session, args):
if suboptions.source:
repo_opts['src'] = True
task_id = session.newRepo(tag, **repo_opts)
- print "Regenerating repo for tag " + tag
+ print "Regenerating repo for tag: %s" % tag
+ print "Created task:", task_id
+ print "Task info: %s/taskinfo?taskID=%s" % (options.weburl, task_id)
if _running_in_bg() or suboptions.nowait:
return
else:
--
2.1.0
8 years, 4 months
[PATCH 1/2] avoid db error when taskSetWait called with empty task list
by Mike McLean
---
hub/kojihub.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/hub/kojihub.py b/hub/kojihub.py
index 4255f80..acdea2b 100644
--- a/hub/kojihub.py
+++ b/hub/kojihub.py
@@ -10535,7 +10535,7 @@ class Host(object):
update = UpdateProcessor('task', clauses=['parent=%(parent)s'], values=locals())
update.set(awaited=True)
update.execute()
- else:
+ elif tasks:
# wait on specified subtasks
update = UpdateProcessor('task', clauses=['id IN %(tasks)s', 'parent=%(parent)s'], values=locals())
update.set(awaited=True)
@@ -10545,6 +10545,8 @@ class Host(object):
clauses=['id NOT IN %(tasks)s', 'parent=%(parent)s', 'awaited=true'])
update.set(awaited=False)
update.execute()
+ else:
+ logger.warning('taskSetWait called on empty task list by parent: %s', parent)
def taskWaitCheck(self,parent):
--
2.1.0
8 years, 4 months
[PATCH] ensure fixed_params variable is defined
by Mike McLean
---
builder/kojid | 1 +
1 file changed, 1 insertion(+)
diff --git a/builder/kojid b/builder/kojid
index e578551..8851b0e 100755
--- a/builder/kojid
+++ b/builder/kojid
@@ -3271,6 +3271,7 @@ class BaseImageTask(OzImageTask):
# options and turning the underlying format option back into one of the two target
# image types ('vsphere-ova' or 'rhevm-ova') that are used to generate the intermediate
# disk image
+ fixed_params = []
if format == 'vagrant-virtualbox':
format = 'vsphere-ova'
img_opts['vsphere_ova_format'] = 'vagrant-virtualbox'
--
2.1.0
8 years, 4 months
[PATCH] fix nvr recycling
by Mike McLean
---
hub/kojihub.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hub/kojihub.py b/hub/kojihub.py
index c3cdd3d..5d99d60 100644
--- a/hub/kojihub.py
+++ b/hub/kojihub.py
@@ -4457,7 +4457,7 @@ def new_build(data):
tables=['build'], columns=['id', 'state', 'task_id'],
clauses=['pkg_id=%(pkg_id)s', 'version=%(version)s',
'release=%(release)s'],
- values=data, opts={'rowlock':True})
+ values=data, opts={'rowlock':True, 'asList':True})
row = query.executeOne()
if row:
build_id, state, task_id = row
@@ -4474,7 +4474,7 @@ def new_build(data):
if st_desc in ('FAILED','CANCELED'):
#should be ok to replace
update = UpdateProcessor('build', clauses=['id=%(id)s'], values=data)
- update.set(**dslice(data, ['owner', 'start_time', 'completion_time']))
+ update.set(**dslice(data, ['state', 'task_id', 'owner', 'start_time', 'completion_time']))
update.rawset(create_event='get_event()')
update.execute()
builddir = koji.pathinfo.build(data)
--
2.1.0
8 years, 4 months
Koji code has moved to Pagure
by Mike McLean
The Koji repo in Pagure should be considered the primary git repo for
Koji development.
https://pagure.io/koji
To submit patches, you may either post here (koji-devel) as we have in
the past, or submit a pull request in Pagure.
For the moment, I will continue to sync the fedorahosted git from the
primary in Pagure. I.e. it becomes a read-only mirror.
8 years, 4 months