extras-buildsys/utils/pushscript Push.py, 1.48, 1.49 Utils.py, 1.19, 1.20

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	Push.py Utils.py 
Log Message:
Don't require _gpg_name to be set in ~/.rpmmacros, better for multi-key setups.  Requires disabling signkeycheck for now.


Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- Push.py	24 Oct 2007 08:28:52 -0000	1.48
+++ Push.py	24 Oct 2007 17:44:14 -0000	1.49
@@ -73,7 +73,7 @@
             filelist = []
     
         foo = string.join(files)
-        result = os.system('echo %s | xargs rpm --resign' % foo)
+        result = os.system('echo %s | xargs rpm --define "_gpg_name %s" --resign' % (foo, cfg.signkeyname))
         if result != 0:
             return result
         numfiles = len(filelist)


Index: Utils.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Utils.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Utils.py	6 May 2007 15:54:05 -0000	1.19
+++ Utils.py	24 Oct 2007 17:44:14 -0000	1.20
@@ -78,6 +78,8 @@
         sys.exit(errno.EPERM)
 
 
+# FIXME: this is too simplistic now that we explicitly pass the key name
+#        to --resign in Push.py
 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!'