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

Use new hashsum utility to generate sha1sums of isos.

Browse Source 
Call a generic function each time we create an iso file.
This commit is contained in:
Jesse Keating 2008-07-14 23:27:40 -04:00
parent 38bd19ea9a
commit ec8b64e6cf
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/pypungi/__init__.py
View File

@ -839,6 +839,23 @@ cost=500
repofile.write(repocontent) repofile.write(repocontent)
repofile.close() repofile.close()
def _doIsoSha1(self, path, shafile):
"""Simple function to wrap creating sha1sums of iso files."""
try:
sha1file = open(shafile, 'a')
except IOError:
self.logger.error("Could not open sha1sum file: %s" % shafile)
self.logger.info("Generating sha1sum of %s" % path)
sha1sum = pypungi.util._doCheckSum(path, 'sha1', self.logger)
if sha1sum:
sha1file.write("%s %s\n" % (sha1sum, os.path.basename(path)))
else:
self.logger.error('Failed to generate sha1sum for %s' % sha1file)
sys.exit(1)
sha1file.close()
def doCreateIsos(self, split=True): def doCreateIsos(self, split=True):
"""Create isos of the tree, optionally splitting the tree for split media.""" """Create isos of the tree, optionally splitting the tree for split media."""
@ -953,9 +970,8 @@ cost=500
pypungi.util._doRunCommand(['/usr/bin/implantisomd5', isofile], self.logger) pypungi.util._doRunCommand(['/usr/bin/implantisomd5', isofile], self.logger)
# shove the sha1sum into a file # shove the sha1sum into a file
sha1file = open(os.path.join(self.isodir, 'SHA1SUM'), 'a') sha1file = os.path.join(self.isodir, 'SHA1SUM')
pypungi.util._doRunCommand(['/usr/bin/sha1sum', isoname], self.logger, rundir=self.isodir, output=sha1file) self._doIsoSha1(isofile, sha1file)
sha1file.close()
# return the .discinfo file # return the .discinfo file
if not self.config.get('default', 'arch') == 'source': if not self.config.get('default', 'arch') == 'source':
@ -1013,9 +1029,8 @@ cost=500
pypungi.util._doRunCommand(['/usr/bin/implantisomd5', isofile], self.logger) pypungi.util._doRunCommand(['/usr/bin/implantisomd5', isofile], self.logger)
# shove the sha1sum into a file # shove the sha1sum into a file
sha1file = open(os.path.join(self.isodir, 'SHA1SUM'), 'a') sha1file = os.path.join(self.isodir, 'SHA1SUM')
pypungi.util._doRunCommand(['/usr/bin/sha1sum', isoname], self.logger, rundir=self.isodir, output=sha1file) self._doIsoSha1(isofile, sha1file)
sha1file.close()
# keep track of the CD images we've written # keep track of the CD images we've written
isolist.append(self.mkrelative(isofile)) isolist.append(self.mkrelative(isofile))
@ -1034,9 +1049,8 @@ cost=500
pypungi.util._link(os.path.join(self.topdir, 'images', 'boot.iso'), isofile, self.logger) pypungi.util._link(os.path.join(self.topdir, 'images', 'boot.iso'), isofile, self.logger)
# shove the sha1sum into a file # shove the sha1sum into a file
sha1file = open(os.path.join(self.isodir, 'SHA1SUM'), 'a') sha1file = os.path.join(self.isodir, 'SHA1SUM')
pypungi.util._doRunCommand(['/usr/bin/sha1sum', isoname], self.logger, rundir=self.isodir, output=sha1file) self._doIsoSha1(isofile, sha1file)
sha1file.close()
# Do some clean up # Do some clean up
dirs = os.listdir(self.archdir) dirs = os.listdir(self.archdir)