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

iso-wrapper: Refactor functions

Browse Source 
Split the function for getting implant MD5 into two functions, so that
we can have access to other information retrieved by checkisomd5
command. A test case is added for both functions.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2017-02-20 10:35:10 +01:00
parent 306f7e69b0
commit ae5ee3d856
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pungi/wrappers/iso.py
View File

@ -195,11 +195,12 @@ def get_checkisomd5_cmd(iso_path, just_print=False):
return cmd return cmd
def get_implanted_md5(iso_path, logger=None): def get_checkisomd5_data(iso_path, logger=None):
cmd = get_checkisomd5_cmd(iso_path, just_print=True) cmd = get_checkisomd5_cmd(iso_path, just_print=True)
retcode, output = run(cmd) retcode, output = run(cmd)
line = output.splitlines()[0] items = [line.strip().rsplit(":", 1) for line in output.splitlines()]
md5 = line.rsplit(":")[-1].strip() items = dict([(k, v.strip()) for k, v in items])
md5 = items.get(iso_path, '')
if len(md5) != 32: if len(md5) != 32:
# We have seen cases where the command finished successfully, but # We have seen cases where the command finished successfully, but
# returned garbage value. We need to handle it, otherwise there would # returned garbage value. We need to handle it, otherwise there would
@ -210,7 +211,11 @@ def get_implanted_md5(iso_path, logger=None):
logger.critical('Implanted MD5 in %s is not valid: %r', iso_path, md5) logger.critical('Implanted MD5 in %s is not valid: %r', iso_path, md5)
logger.critical('Ran command %r; exit code %r; output %r', cmd, retcode, output) logger.critical('Ran command %r; exit code %r; output %r', cmd, retcode, output)
return None return None
return md5 return items
def get_implanted_md5(iso_path, logger=None):
return (get_checkisomd5_data(iso_path, logger=logger) or {}).get(iso_path)
def get_isohybrid_cmd(iso_path, arch): def get_isohybrid_cmd(iso_path, arch):