extras-buildsys/utils ExtrasPushUtils.py, 1.2, 1.3 extras-push-new, 1.50, 1.51

[Michael Schwendt (mschwendt)]

Author: mschwendt

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

Modified Files:
	ExtrasPushUtils.py extras-push-new 
Log Message:
- also move out the signers gid check, so it can be reused in more scripts


Index: ExtrasPushUtils.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/ExtrasPushUtils.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ExtrasPushUtils.py	20 Aug 2006 12:35:15 -0000	1.2
+++ ExtrasPushUtils.py	20 Aug 2006 12:53:17 -0000	1.3
@@ -15,8 +15,11 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+import errno
 import os, sys
 
+signersgid = 100581  # signers group
+
 distro = 'fedora'
 project = 'extras'
 
@@ -46,3 +49,14 @@
             if result > 127:
                 sys.exit(1)
             sys.exit(result)
+
+def signer_gid_check():
+    if os.getgid() != signersgid:
+        grpname = '(unknown)'
+        try:
+            import grp
+            grpname = grp.getgrgid(signersgid)[0]
+        except:
+            print 'WARNING: Could not get group name for gid %d' % signersgid
+        print 'ERROR: Change into the %s group before running this!  Use "newgrp %s".' % (grpname, grpname)
+        sys.exit(errno.EPERM)


Index: extras-push-new
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-new,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- extras-push-new	20 Aug 2006 12:44:20 -0000	1.50
+++ extras-push-new	20 Aug 2006 12:53:17 -0000	1.51
@@ -29,7 +29,6 @@
 
 DEBUG = False
 
-signersgid = 100581  # signers group
 signkeyname = 'extras at fedoraproject.org'
 
 # Where we store mails to be sent and our main lockfile.
@@ -688,16 +687,8 @@
 
 if __name__ == '__main__':
     if opts.gidcheck:
-        if os.getgid() != signersgid:
-            grpname = '(unknown)'
-            try:
-                import grp
-                grpname = grp.getgrgid(signersgid)[0]
-            except:
-                print 'WARNING: Could not get group name for gid %d' % signersgid
-            print 'ERROR: Change into the %s group before running this!  Use "newgrp %s".' % (grpname, grpname)
-            sys.exit(errno.EPERM)
-
+        signer_gid_check()
+    
     if opts.signkeycheck:
         if signkeyname != os.popen('rpm --eval %_gpg_name','r').read().rstrip():
             print 'ERROR: Configure ~/.rpmmacros for proper GPG signing before running this!'