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

better error for wrong include xml format

Browse source
This commit is contained in:
Tomas Kopecek 2022-11-10 10:42:30 +01:00
parent b8b52884b5
commit 8b1030f863
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
plugins/builder/kiwi.py
View file

@ -204,9 +204,12 @@ class KiwiCreateImageTask(BaseBuildTask):
raise koji.GenericError(f"Unhandled include protocol in include path: {path}.")
inc = xml.dom.minidom.parse(path) # nosec
# every included xml has image root element again
for node in list(inc.getElementsByTagName('image')[0].childNodes):
if node.nodeName != 'repository':
image.appendChild(node)
try:
for node in list(inc.getElementsByTagName('image')[0].childNodes):
if node.nodeName != 'repository':
image.appendChild(node)
except IndexError:
raise koji.GenericError("Included file needs to contain <image> tag.")
image.removeChild(inc_node)
# remove remaining old repos