From b231f35b52825383c8b8d8f33b8fe651d78489b8 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Fri, 21 Jan 2011 13:59:34 +0100 Subject: Unify --md5 parameter handling Unify handling of the --md5 parameter between the two targets using it: 'fedpkg local' and 'fedpkg srpm'. If no --md5 parameter is given, then the default hashtype is used, as determined in PackageModule.__init__() ('md5' for el5 and el6, and 'sha256' for everything else). If an --md5 parameter is given, then use the 'md5' hashtype. --- src/pyfedpkg/__init__.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/pyfedpkg/__init__.py') diff --git a/src/pyfedpkg/__init__.py b/src/pyfedpkg/__init__.py index 9c76fc0..4a36ffc 100644 --- a/src/pyfedpkg/__init__.py +++ b/src/pyfedpkg/__init__.py @@ -1473,7 +1473,7 @@ class PackageModule: _run_command(cmd, shell=True) return - def local(self, arch=None, hashtype='sha256'): + def local(self, arch=None, hashtype=None): """rpmbuild locally for given arch. Takes arch to build for, and hashtype to build with. @@ -1484,6 +1484,10 @@ class PackageModule: """ + # Figure out which hashtype to use, if not provided one + if not hashtype: + hashtype = self.hashtype + # This could really use a list of arches to build for and loop over # Get the sources sources(self.path) @@ -1684,11 +1688,12 @@ class PackageModule: """ - cmd = ['rpmbuild'] - cmd.extend(self.rpmdefines) # Figure out which hashtype to use, if not provided one if not hashtype: hashtype = self.hashtype + + cmd = ['rpmbuild'] + cmd.extend(self.rpmdefines) # This may need to get updated if we ever change our checksum default if not hashtype == 'sha256': cmd.extend(["--define '_source_filedigest_algorithm %s'" % hashtype, -- cgit