[Piuparts-commits] [piuparts] 03/04: p-s: catch MasterNotOK exception while talking to the master
Holger Levsen
holger at moszumanska.debian.org
Mon Dec 15 00:08:31 UTC 2014
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to branch develop
in repository piuparts.
commit ad8d801dde105b525e51cee7048d701685242cb9
Author: Andreas Beckmann <anbe at debian.org>
Date: Sun Dec 14 03:05:24 2014 +0100
p-s: catch MasterNotOK exception while talking to the master
Signed-off-by: Andreas Beckmann <anbe at debian.org>
---
debian/changelog | 1 +
piuparts-slave.py | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 8b6a903..74b8299 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ piuparts (0.62) UNRELEASED; urgency=medium
to 'jessie' and 'wheezy' for ongoing development.
* piuparts-slave.py:
- Handle Ctrl-C while downloading Packages files and flush/unreserve, too.
+ - Catch another exception that may happen while talking to the master.
[ Holger Levsen ]
* piuparts.conf.pejacevic: add new suite: jessie2proposed.
diff --git a/piuparts-slave.py b/piuparts-slave.py
index faa5239..22ee204 100644
--- a/piuparts-slave.py
+++ b/piuparts-slave.py
@@ -542,7 +542,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 (MasterDidNotGreet, MasterIsCrazy, MasterCommunicationFailed):
+ except (MasterDidNotGreet, MasterIsCrazy, MasterCommunicationFailed, MasterNotOK):
logging.error("connection to master failed")
self._error_wait_until = time.time() + 900
self._slave.close()
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git
More information about the Piuparts-commits
mailing list