extras-buildsys/utils/pushscript Utils.py, 1.10, 1.11 Push.py, 1.30, 1.31 PushPackage.py, 1.1, 1.2

[Michael Schwendt (mschwendt)]

Author: mschwendt

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

Modified Files:
	Utils.py Push.py PushPackage.py 
Log Message:
move and reuse the sign-key check


Index: Utils.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Utils.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Utils.py	9 Feb 2007 19:23:42 -0000	1.10
+++ Utils.py	21 Feb 2007 20:47:53 -0000	1.11
@@ -76,6 +76,12 @@
         sys.exit(errno.EPERM)
 
 
+def sign_key_check(keyname):
+    if keyname != os.popen('rpm --eval %_gpg_name','r').read().rstrip():
+        print 'ERROR: Configure ~/.rpmmacros for proper GPG signing before running this!'
+        sys.exit(errno.EPERM)
+
+
 def install_copy(src,dest,overwrite=False):
     """shutil.copy2 a file, but by default don't overwrite destination"""
     if not overwrite and os.path.exists(dest):


Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- Push.py	21 Feb 2007 20:34:32 -0000	1.30
+++ Push.py	21 Feb 2007 20:47:53 -0000	1.31
@@ -586,9 +586,7 @@
     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)
+        Utils.sign_key_check(cfg.signkeyname)
 
     if '-f' in sys.argv[2:]:
         sys.argv.remove('-f')


Index: PushPackage.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/PushPackage.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PushPackage.py	21 Feb 2007 20:43:21 -0000	1.1
+++ PushPackage.py	21 Feb 2007 20:47:53 -0000	1.2
@@ -39,7 +39,8 @@
     cfg = Utils.load_config_module(sys.argv[1])
 
     Utils.signer_gid_check(cfg.signersgid)
-    # TODO: move signkeycheck from Push.py to Utils, then include here
+    if cfg.opts.signkeycheck:
+        Utils.sign_key_check(cfg.signkeyname)
     os.umask(cfg.signersumask)
 
     if not os.path.exists(cfg.rundir):