extras-buildsys/utils/pushscript Push.py, 1.49, 1.50 BuildSys.py, 1.3, 1.4

[Michael Schwendt (mschwendt)]

Author: mschwendt

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

Modified Files:
	Push.py BuildSys.py 
Log Message:
Recreate plague-results repodata after deleting packages.



Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- Push.py	24 Oct 2007 17:44:14 -0000	1.49
+++ Push.py	5 Mar 2008 22:25:40 -0000	1.50
@@ -221,7 +221,7 @@
         print "ERROR: lockfile %s failure: %s (error %d)" % (repolockname, strerr, err)
         sys.exit(err)
         
-    bs = LocalPlague(needsignroot)
+    bs = LocalPlague(needsignroot, cfg.createrepo)
     bs.PruneBuildResults()
     results = bs.GetBuildResults()
     results = BlackList.get_filtered_build_results(cfg,srcdist,results)


Index: BuildSys.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/BuildSys.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BuildSys.py	2 Mar 2007 16:40:05 -0000	1.3
+++ BuildSys.py	5 Mar 2008 22:25:40 -0000	1.4
@@ -38,8 +38,9 @@
 
 class LocalPlague(BuildSys):
     
-    def __init__(self,needsignroot):
+    def __init__(self, needsignroot, createrepo):
         self.needsignroot = needsignroot
+        self.createrepo = createrepo
 
     def GetBuildResults(self):
         rv = []
@@ -80,7 +81,13 @@
                 rv.append( (name,jobroots) )
         return rv
 
+    def _CreateRepo(self):
+        cmd = self.createrepo + " -x \'*.src.rpm\' -x \'*-debuginfo-*.rpm\' %s" % self.needsignroot
+        Utils.run(cmd)
+
     def PruneBuildResults(self):
+        repochanged = False
+
         for (name,pkgrelroots) in self._ListPlagueResults():
             validbuilds = pkgrelroots
         
@@ -109,6 +116,7 @@
                     print 'Removing old %s' % pkgrelroot
                     if not DEBUG:
                         shutil.rmtree(pkgrelroot)
+                        repochanged = True
                     validbuilds.remove(pkgrelroot)
 
             # Now re-examine the remaining builds and mark unneeded ones as PUSHED.
@@ -160,6 +168,9 @@
                     relroot = nextrelroot
                     (n,a,e,v,r) = (nextn,nexta,nexte,nextv,nextr)
 
+        if repochanged:
+            self._CreateRepo()
+
 
 class BuildResults: