From ff8f77bab711f2b116f7ee33830e1ff752c9de82 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 24 May 2010 10:53:26 -0400 Subject: [PATCH] Add checksumheader config option This is a path to a file which is prepended to the CHECKSUM output. Useful for providing some basic instructions or links about the CHECKSUM contents. --- src/pypungi/__init__.py | 30 +++++++++++++++++++++++++----- src/pypungi/config.py | 1 + 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/pypungi/__init__.py b/src/pypungi/__init__.py index 63d12d4..92eedb0 100644 --- a/src/pypungi/__init__.py +++ b/src/pypungi/__init__.py @@ -1019,6 +1019,29 @@ cost=500 repofile.write(repocontent) repofile.close() + def _doIsoChecksumHeader(self, csumfile, csumheader): + """Add a header to the checksum file.""" + + if not csumheader: + return + + try: + header = open(csumfile).read() + except IOError: + self.logger.error("Could not read checksum header: %s" % csumheader) + + if not header: + return + + try: + checkfile = open(csumfile, 'w') + except IOError: + self.logger.error("Could not open checksum file: %s" % csumfile) + + self.logger.info("Adding checksum header to %s" % csumfile) + checkfile.write(header) + checkfile.close() + def _doIsoChecksum(self, path, csumfile): """Simple function to wrap creating checksums of iso files.""" @@ -1144,11 +1167,8 @@ cost=500 self.config.get('pungi', 'iso_basename'), self.config.get('pungi', 'version'), self.config.get('pungi', 'arch'))) - # Write a line about what checksums are used. - # sha256sum is magic... - file = open(csumfile, 'w') - file.write('# The image checksum(s) are generated with sha256sum.\n') - file.close() + csumheader = self.config.get('pungi', 'checksumheader') + self._doIsoChecksumHeader(csumfile, csumheader) self._doIsoChecksum(isofile, csumfile) # return the .discinfo file diff --git a/src/pypungi/config.py b/src/pypungi/config.py index 848a2d4..160d3fb 100644 --- a/src/pypungi/config.py +++ b/src/pypungi/config.py @@ -42,4 +42,5 @@ class Config(SafeConfigParser): self.set('pungi', 'bugurl', 'https://bugzilla.redhat.com') self.set('pungi', 'cdsize', '695.0') self.set('pungi', 'debuginfo', "True") + self.set('pungi', 'checksumheader', "") -- 1.7.0