almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

Include the output of getisoimage in the error message

Browse Source 
JIRA: RHELCMP-720
Signed-off-by: Haibo Lin <hlin@redhat.com>
This commit is contained in:
Haibo Lin 2020-06-01 12:42:53 +08:00
parent d6caf0785b
commit 7c2743fb50
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pungi_utils/unified_isos.py
View File

@ -94,6 +94,10 @@ class UnifiedISO(object):
self.createiso() self.createiso()
self.update_checksums() self.update_checksums()
self.dump_manifest() self.dump_manifest()
except RuntimeError as exc:
if hasattr(exc, "output"):
print(exc.output)
raise
finally: finally:
if delete_temp: if delete_temp:
shutil.rmtree(self.temp_dir) shutil.rmtree(self.temp_dir)
@ -377,7 +381,8 @@ class UnifiedISO(object):
run( run(
iso.get_mkisofs_cmd( iso.get_mkisofs_cmd(
iso_path, [source_dir], volid=volid, exclude=["./lost+found"] iso_path, [source_dir], volid=volid, exclude=["./lost+found"]
) ),
universal_newlines=True,
) )
# implant MD5 # implant MD5

2
tests/test_unified_isos.py
View File

@ -620,7 +620,7 @@ class TestCreateiso(PungiTestCase):
self.assertEqual( self.assertEqual(
run.mock_calls, run.mock_calls,
[ [
mock.call(self.mkisofs_cmd), mock.call(self.mkisofs_cmd, universal_newlines=True),
mock.call(iso.get_implantisomd5_cmd.return_value), mock.call(iso.get_implantisomd5_cmd.return_value),
mock.call(iso.get_manifest_cmd.return_value), mock.call(iso.get_manifest_cmd.return_value),
] ]