Name the checksum file after the isos being generated.

This commit is contained in:
Jesse Keating 2009-02-10 15:03:29 -08:00
parent 9b77cea3b7
commit 7dc76be687

View File

@ -1054,9 +1054,12 @@ cost=500
if not self.config.get('pungi', 'arch') == 'source': if not self.config.get('pungi', 'arch') == 'source':
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 checksum into a file
sha1file = os.path.join(self.isodir, 'SHA1SUM') csumfile = os.path.join(self.isodir, '%s-%s-%s-CHECKSUM' % (
self._doIsoChecksum(isofile, sha1file) self.config.get('pungi', 'iso_basename'),
self.config.get('pungi', 'version'),
self.config.get('pungi', 'arch')))
self._doIsoChecksum(isofile, csumfile)
# return the .discinfo file # return the .discinfo file
if not self.config.get('pungi', 'arch') == 'source': if not self.config.get('pungi', 'arch') == 'source':
@ -1113,9 +1116,8 @@ cost=500
if not self.config.get('pungi', 'arch') == 'source': if not self.config.get('pungi', 'arch') == 'source':
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 checksum into a file
sha1file = os.path.join(self.isodir, 'SHA1SUM') self._doIsoChecksum(isofile, csumfile)
self._doIsoChecksum(isofile, sha1file)
# 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))
@ -1133,9 +1135,8 @@ cost=500
# link the boot iso to the iso dir # link the boot iso to the iso dir
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 checksum into a file
sha1file = os.path.join(self.isodir, 'SHA1SUM') self._doIsoChecksum(isofile, csumfile)
self._doIsoChecksum(isofile, sha1file)
# Do some clean up # Do some clean up
dirs = os.listdir(self.archdir) dirs = os.listdir(self.archdir)