extras-buildsys/utils/pushscript Config_Extras.py, 1.11, 1.12 Push.py, 1.11, 1.12

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24181

Modified Files:
	Config_Extras.py Push.py 
Log Message:
Didn't mean to commit this. Was just testing something with "Config_Test.py"



Index: Config_Extras.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Config_Extras.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Config_Extras.py	29 Oct 2006 17:58:15 -0000	1.11
+++ Config_Extras.py	29 Oct 2006 18:03:18 -0000	1.12
@@ -28,6 +28,7 @@
     mail = True
     repoprune = True
     repoview = True
+    signkeycheck = True
     doublesync = False
 
 top_workdir = '/srv/rpmbuild'


Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Push.py	29 Oct 2006 17:58:15 -0000	1.11
+++ Push.py	29 Oct 2006 18:03:18 -0000	1.12
@@ -262,7 +262,7 @@
     return hdr['excludearch']
 
 
-def sign_pkgs(filelist,keyname):
+def sign_pkgs(filelist):
     """gpg sign all the rpms"""
     numfiles = len(filelist)
     if numfiles < 1:
@@ -280,7 +280,7 @@
             filelist = []
     
         foo = string.join(files)
-        result = os.system('echo %s | xargs rpm --define "_signature gpg" --define "_gpg_name %s" --resign' % (foo,keyname))
+        result = os.system('echo %s | xargs rpm --resign' % foo)
         if result != 0:
             return result
         numfiles = len(filelist)
@@ -484,7 +484,7 @@
 
     try:
         print "Signing Packages:"
-        rv = sign_pkgs( find_files(signtmpdir,'*.rpm'), cfg.signkeyname )
+        rv = sign_pkgs( find_files(signtmpdir,'*.rpm') )
         if rv:
             print "Error signing packages! Please be patient - cleaning up."
             raise Exception
@@ -582,6 +582,10 @@
 
     os.umask(cfg.signersumask)
     Utils.signer_gid_check(cfg.signersgid)
+    if cfg.opts.signkeycheck:
+        if cfg.signkeyname != os.popen('rpm --eval %_gpg_name','r').read().rstrip():
+            print 'ERROR: Configure ~/.rpmmacros for proper GPG signing before running this!'
+            sys.exit(errno.EPERM)
 
     if '-f' in sys.argv[2:]:
         sys.argv.remove('-f')