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

pass build information consistently to the postImport callback

Browse source 
Always pass the build infomation as the "build" argument to the
postImport callback. For type='build' and type='image' imports,
this change is additive, and so is unlikely to affect existing
plugins. For type='cg' imports, this change makes the callback
consistent with the other callback types, and the CG import
mechanism is new enough that there is probably no code making
use of it yet.
This commit is contained in:
Mike Bonnet 2016-10-20 13:29:49 -07:00
parent 4bde148118
commit c41107ea51
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hub/kojihub.py
View file

@ -4898,7 +4898,7 @@ class CG_Importer(object):
self.import_metadata()
koji.plugin.run_callbacks('postImport', type='cg', metadata=metadata,
directory=directory, buildinfo=self.buildinfo)
directory=directory, build=self.buildinfo)
return self.buildinfo
@ -5450,7 +5450,7 @@ def import_build_in_place(build):
WHERE id=%(build_id)i"""
_dml(update, locals())
koji.plugin.run_callbacks('postBuildStateChange', attribute='state', old=buildinfo['state'], new=st_complete, info=buildinfo)
koji.plugin.run_callbacks('postImport', type='build', in_place=True, srpm=srpm, rpms=rpms)
koji.plugin.run_callbacks('postImport', type='build', in_place=True, build=buildinfo, srpm=srpm, rpms=rpms)
return build_id
def _import_wrapper(task_id, build_info, rpm_results):
@ -8183,7 +8183,7 @@ def importImageInternal(task_id, build_id, imgdata):
_dml(q, {'archive_id': archive['id'], 'rpm_id': rpm_id})
koji.plugin.run_callbacks('postImport', type='image', image=imgdata,
fullpath=fullpath)
build=build_info, fullpath=fullpath)
#
# XMLRPC Methods