extras-buildsys/utils/pushscript RCNeedsign.py,1.4,1.5

[Michael Schwendt (mschwendt)]

Author: mschwendt

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

Modified Files:
	RCNeedsign.py 
Log Message:
try something to check needsign with active blacklist


Index: RCNeedsign.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/RCNeedsign.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RCNeedsign.py	6 May 2007 16:03:56 -0000	1.4
+++ RCNeedsign.py	6 Jul 2007 18:45:05 -0000	1.5
@@ -22,14 +22,14 @@
 import errno, os, sys
 import fnmatch, shutil, time
 
-import Utils, Push, WhatsNew, RepoSupport
+import Utils, Push, WhatsNew, RepoSupport, BlackList
 from BuildSys import LocalPlague
 from BuildReport import NoBuildReportManager
 
 
 if __name__ == '__main__':
     if len(sys.argv) < 2:
-        print 'Usage: %s <project> <release>\n' % os.path.basename(sys.argv[0])
+        print 'Usage: %s <project> <release> [-x]\n' % os.path.basename(sys.argv[0])
         sys.exit(errno.EINVAL)
 
     cfg = Utils.load_config_module(sys.argv[1])
@@ -43,9 +43,13 @@
     br = LocalPlague(needsignroot)
     br.PruneBuildResults()  # optional
     results = br.GetBuildResults()
-#    results = BlackList.get_filtered_build_results(cfg,dist,results)
-#    for br in results:
-#        br.origin = None  # disconnect from needsign (very important!)
+
+    mailowners = True
+    if (len(sys.argv)>2 and sys.argv[3]=='-x'):
+        results = BlackList.get_filtered_build_results(cfg,dist,results)
+        # Blacklisted pkgs can cause false positives, so don't mail the
+        # owners when we check needsign with excluded pkgs.
+        mailowners = False
 
     import tempfile
     print 'Copying build results to temporary working directory:'
@@ -85,7 +89,11 @@
         raise
     shutil.rmtree(signtmpdir)
 
-    cmd = '/srv/extras-push/work/extras-repoclosure/rc-run.py --mail=owners --needsign=file://%s %s' % (tmpdir+'/%s/%s/',dist)
+    if mailowners:
+        mailopts = '--mail=owners'
+    else:
+        mailopts = ''
+    cmd = '/srv/extras-push/work/extras-repoclosure/rc-run.py %s --needsign=file://%s %s' % (mailopts,tmpdir+'/%s/%s/',dist)
     print 'Running', cmd
     rc = os.system(cmd)