[Piuparts-commits] [SCM] piuparts git repository branch, piatti, updated. 0.45-75-g5fca52d

[Andreas Beckmann]

The following commit has been merged in the piatti branch:
commit 4bb5a7153a127ca948daa9d0bd1286542c428e8e
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Fri Jun 22 21:12:06 2012 +0200

    p-s: move checks back from _process() to run()
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/piuparts-slave.py b/piuparts-slave.py
index 498221d..a4ae001 100644
--- a/piuparts-slave.py
+++ b/piuparts-slave.py
@@ -346,7 +346,12 @@ class Section:
                 logging.info("busy")
                 self._error_wait_until = time.time() + 900
             else:
-                return self._process()
+                if self._talk_to_master():
+                    if do_processing:
+                        if not self._slave.get_reserved():
+                            self._idle_wait_until = time.time() + int(self._config["idle-sleep"])
+                        else:
+                            return self._process()
             finally:
                 os.chdir(oldcwd)
         return 0
@@ -385,13 +390,6 @@ class Section:
 
 
     def _process(self):
-        if not self._talk_to_master():
-            return 0
-
-        if not self._slave.get_reserved():
-            self._idle_wait_until = time.time() + int(self._config["idle-sleep"])
-            return 0
-
         if self._config["distro"]:
             distros = [self._config["distro"]]
         else:

-- 
piuparts git repository