[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 9d5e5f7ff8d813adc1648d8f470570fa1219835e
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Fri Jun 22 21:46:32 2012 +0200

    p-s: control flow cleanup in _talk_to_master()
    
    use try/except/else/finally
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/piuparts-slave.py b/piuparts-slave.py
index cdcbb84..dc5679d 100644
--- a/piuparts-slave.py
+++ b/piuparts-slave.py
@@ -379,28 +379,29 @@ class Section:
         except MasterIsBusy:
             logging.error("master is busy")
             self._error_wait_until = time.time() + random.randrange(60, 180)
-            return 0
         except:
             logging.error("connection to master failed")
             self._error_wait_until = time.time() + 900
-            return 0
-
-        for logdir in ["pass", "fail", "untestable"]:
-            for basename in os.listdir(logdir):
-                if basename.endswith(".log"):
-                    fullname = os.path.join(logdir, basename)
-                    self._slave.send_log(self._config.section, logdir, fullname)
-                    os.remove(fullname)
-
-        if not self._slave.get_reserved():
-            max_reserved = int(self._config["max-reserved"])
-            while len(self._slave.get_reserved()) < max_reserved and self._slave.reserve():
-                pass
-
-        self._slave.get_status(self._config.section)
-        self._slave.close()
-
-        return True
+        else:
+            try:
+                for logdir in ["pass", "fail", "untestable"]:
+                    for basename in os.listdir(logdir):
+                        if basename.endswith(".log"):
+                            fullname = os.path.join(logdir, basename)
+                            self._slave.send_log(self._config.section, logdir, fullname)
+                            os.remove(fullname)
+
+                if not self._slave.get_reserved():
+                    max_reserved = int(self._config["max-reserved"])
+                    while len(self._slave.get_reserved()) < max_reserved and self._slave.reserve():
+                        pass
+
+                self._slave.get_status(self._config.section)
+            else:
+                return True
+        finally:
+            self._slave.close()
+        return False
 
 
     def _process(self):

-- 
piuparts git repository