[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.45-104-g9754378

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit 48830dd3fc3f4e94f898025aa7d7dd21ad4372f9
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Mon Aug 6 10:04:36 2012 +0200

    p-s: don't forget to handle MasterDidNotGreet exception
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/piuparts-slave.py b/piuparts-slave.py
index 956e0ee..f3ed841 100644
--- a/piuparts-slave.py
+++ b/piuparts-slave.py
@@ -447,7 +447,7 @@ class Section:
         except MasterCantRecycle:
             logging.error("master has nothing to recycle")
             self._recycle_wait_until = max(time.time(), self._idle_wait_until) + 3600
-        except (MasterIsCrazy, MasterCommunicationFailed):
+        except (MasterDidNotGreet, MasterIsCrazy, MasterCommunicationFailed):
             logging.error("connection to master failed")
             self._error_wait_until = time.time() + 900
         else:

-- 
piuparts git repository