extras-buildsys/utils/pushscript Push.py,1.7,1.8

Michael Schwendt (mschwendt) fedora-extras-commits at redhat.com
Wed Oct 25 13:01:16 UTC 2006


Author: mschwendt

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

Modified Files:
	Push.py 
Log Message:
Push.py


Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Push.py	24 Oct 2006 20:28:19 -0000	1.7
+++ Push.py	25 Oct 2006 13:01:11 -0000	1.8
@@ -344,6 +344,14 @@
     # if it is a noarch package, copy2 it to all arch locations
     # if it is a debuginfo package, move it into the 'debug' dir for that arch
 
+    if len(filedict['srpm']) > 1:
+        mark_pkg_pushed( os.path.join(needsignroot,name,os.path.basename(pkgrelroot)) )
+        buildreportinfo = 'Invalid build-job: %s-%s\n' % (name,os.path.basename(pkgrelroot))
+        if buildreport:
+            rundirfile.write(buildreportinfo)
+        rundirfile.close()
+        raise PushWarning, 'WARNING: %s ' % pkg_fn
+    
     package = filedict['srpm'][0]
     (n,a,e,v,r) = naevr(package)
     pkg_fn = os.path.basename(package)
@@ -356,6 +364,10 @@
         buildreportinfo = '%s-%s-%s\n' % (n,v,r)
     else:  # src.rpm published before, exclude entire build job
         mark_pkg_pushed( os.path.join(needsignroot,name,os.path.basename(pkgrelroot)) )
+        buildreportinfo = 'Invalid rebuild: %s-%s\n' % (name,os.path.basename(pkgrelroot))
+        if buildreport:
+            rundirfile.write(buildreportinfo)
+        rundirfile.close()
         raise PushWarning, 'WARNING: %s published before' % pkg_fn
 
     for package in filedict['rpm'] + filedict['debuginfo']:




More information about the scm-commits mailing list