[Piuparts-commits] [piuparts] 02/04: p-s: handle Ctrl-C while downloading Packages files

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch develop
in repository piuparts.

commit d23d94eddb1a8751df9dbb3b1aff452ddea1de01
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sun Dec 14 02:57:56 2014 +0100

    p-s: handle Ctrl-C while downloading Packages files
    
    flush/unreserve as if interrupted during testing
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
---
 debian/changelog  | 2 ++
 piuparts-slave.py | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c631c47..8b6a903 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ piuparts (0.62) UNRELEASED; urgency=medium
       symlinks: report all symlinks and their targets.
   * distros.conf: Reactivate 'testing' and 'stable' aliases, switch them back
     to 'jessie' and 'wheezy' for ongoing development.
+  * piuparts-slave.py:
+    - Handle Ctrl-C while downloading Packages files and flush/unreserve, too.
 
   [ Holger Levsen ]
   * piuparts.conf.pejacevic: add new suite: jessie2proposed.
diff --git a/piuparts-slave.py b/piuparts-slave.py
index 2e6be31..faa5239 100644
--- a/piuparts-slave.py
+++ b/piuparts-slave.py
@@ -591,6 +591,7 @@ class Section:
 
 
     def _process(self):
+        global interrupted
         self._slave.close()
 
         packagenames = set([x[0] for x in self._slave.get_reserved()])
@@ -610,6 +611,8 @@ class Section:
                     logging.error("failed to fetch packages file for %s" % distro)
                     self._error_wait_until = time.time() + 900
                     return 0
+                except KeyboardInterrupt:
+                    interrupted = True
         del packagenames
 
         test_count = 0

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git