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

fix packaging

Browse source
This commit is contained in:
Tomas Kopecek 2022-01-12 10:23:21 +01:00
parent 565f59459e
commit dfc5b01c9c
3 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plugins/builder/kiwi.py
View file

@ -303,7 +303,7 @@ class KiwiCreateImageTask(BaseBuildTask):
arch=arch,
task_id=self.id,
repo_id=repo_info['id'],
install_group='kiwi',
install_group='kiwi-build',
setup_dns=True,
bind_opts={'dirs': {'/dev': '/dev', }})
broot.workdir = self.workdir
@ -404,10 +404,7 @@ class KiwiCreateImageTask(BaseBuildTask):
if os.path.exists(root_log_path):
self.uploadFile(root_log_path, remoteName="image-root.log")
for ftype in ('disk_image', 'disk_format_image', 'installation_image'):
fdata = result_files.get(ftype)
if not fdata:
continue
for ftype, fdata in result_files.items():
# hack to use correct paths derived from results
filename = os.path.basename(fdata['filename'])
(name, ext) = os.path.splitext(filename)