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

PR#4083: refuse image tasks when required deps are missing

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

Fixes #4105
https://pagure.io/koji/issue/4105
This commit is contained in:
Tomas Kopecek 2024-08-15 09:03:53 +02:00
commit 69dd65b01e
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
builder/kojid
View file

@ -2753,7 +2753,7 @@ class BuildBaseImageTask(BuildImageTask):
self.logger.error(
"ImageFactory features require the following dependencies: pykickstart, "
"imagefactory, oz and possibly python-hashlib")
raise koji.ApplianceError('ImageFactory functions not available')
raise RefuseTask('ImageFactory functions not available')
# Policy check
task_info = self.session.getTaskInfo(self.id)
@ -2912,7 +2912,7 @@ class BuildApplianceTask(BuildImageTask):
self.logger.error(
"Appliance features require the following dependencies: "
"pykickstart, and possibly python-hashlib")
raise koji.ApplianceError('Appliance functions not available')
raise RefuseTask('Appliance functions not available')
# build image
bld_info = None
@ -2999,7 +2999,7 @@ class BuildLiveCDTask(BuildImageTask):
if not image_enabled:
self.logger.error("LiveCD features require the following dependencies: "
"pykickstart, pycdio, and possibly python-hashlib")
raise koji.LiveCDError('LiveCD functions not available')
raise RefuseTask('LiveCD functions not available')
# build the image
bld_info = None
@ -3094,7 +3094,7 @@ class BuildLiveMediaTask(BuildImageTask):
# XXX - are these still required here?
self.logger.error("Missing the following dependencies: "
"pykickstart, pycdio, and possibly python-hashlib")
raise koji.PreBuildError('Live Media functions not available')
raise RefuseTask('Live Media functions not available')
# build the image
bld_info = None
@ -4695,7 +4695,7 @@ class BaseImageTask(OzImageTask):
self.logger.error(
"ImageFactory features require the following dependencies: "
"pykickstart, imagefactory, oz and possibly python-hashlib")
raise koji.ApplianceError('ImageFactory functions not available')
raise RefuseTask('ImageFactory functions not available')
if opts is None:
opts = {}