extras-buildsys/builder builder.py,1.44.2.8.2.1,1.44.2.8.2.1.2.1

[Michael Schwendt (mschwendt)]

Author: mschwendt

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

Modified Files:
      Tag: Plague-0_4_5
	builder.py 
Log Message:
plague-0.4.4.1-racecondition.patch




Index: builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/Attic/builder.py,v
retrieving revision 1.44.2.8.2.1
retrieving revision 1.44.2.8.2.1.2.1
diff -u -r1.44.2.8.2.1 -r1.44.2.8.2.1.2.1
--- builder.py	31 Jan 2008 13:28:04 -0000	1.44.2.8.2.1
+++ builder.py	31 Jan 2008 14:04:49 -0000	1.44.2.8.2.1.2.1
@@ -370,11 +370,17 @@
             self._start_cleanup()
 
     def _status_prepping(self):
+        # Refresh mock status to see whether it changed during sleep.
+        # Avoid mock/plague race condition.
+        if not self._mock_is_prepping():
+            if not self._mock_using_repo():  # status changed during sleep
+                self._status = 'building'
+            return
         # Mock shouldn't exit at all during the prepping stage, if it does
         # something is wrong
         self._watch_mock('failed', 'failed')
         if self._status != 'prepping':
-               return
+            return
 
         # We need to make sure that mock has dumped the status file withing a certain
         # amount of time, otherwise we can't tell what it's doing
@@ -388,8 +394,6 @@
         else:
             if not self._mock_config and self._mock_is_prepping():
                 self._mock_config = self._read_mock_config()
-            if not self._mock_using_repo():
-                self._status = 'building'
 
     def _status_building(self):
         self._watch_mock('done', 'failed')