extras-buildsys/server PackageJob.py,1.31.2.10.4.3,1.31.2.10.4.4

[Michael Schwendt (mschwendt)]

Author: mschwendt

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

Modified Files:
      Tag: Plague-0_4_5
	PackageJob.py 
Log Message:
plague-0.4.4.1-repoadd.patch




Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.31.2.10.4.3
retrieving revision 1.31.2.10.4.4
diff -u -r1.31.2.10.4.3 -r1.31.2.10.4.4
--- PackageJob.py	31 Jan 2008 14:30:13 -0000	1.31.2.10.4.3
+++ PackageJob.py	31 Jan 2008 14:34:23 -0000	1.31.2.10.4.4
@@ -88,7 +88,7 @@
 
 def is_package_job_stage_valid(stage):
     """ Validate a job stage """
-    stages = ['initialize', 'checkout_wait', 'checkout_wait_done', 'checkout', 'make_srpm', 'prep', 'waiting', 'building', 'build_done', 'add_to_repo', 'repodone', 'needsign', 'failed', 'finished']
+    stages = ['initialize', 'checkout_wait', 'checkout_wait_done', 'checkout', 'make_srpm', 'prep', 'waiting', 'building', 'build_done', 'add_to_repo', 'repowait', 'repodone', 'needsign', 'failed', 'finished']
     if stage in stages:
         return True
     return False
@@ -619,6 +619,7 @@
                     self._set_cur_stage('repodone')
             else:
                 self._set_cur_stage('add_to_repo')
+            self.endtime = time.time()
             return False  # Don't want to wait
 
         return True
@@ -694,9 +695,13 @@
         # list from this object directly when the copy operation
         # happens
         if len(self.repofiles):
+            self.endtime = time.time()
+            self._set_cur_stage('repowait')
             self.repo.request_copy(self)
 
-        self.endtime = time.time()
+        return False
+
+    def _stage_repowait(self):
         return True
 
     def repo_add_callback(self, success, bad_file=None):