[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.51-48-g1e35129

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit 492416f4ab5c9fc2a4663a6f69530dcece827be7
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sat May 25 12:37:24 2013 +0200

    p-m: use timeout to prevent master from getting stuck
    
    It is possible that the master gets stuck waiting for a response from
    the slave or while fetching a Packages file - this is usually related
    to network errors.
    Terminate the master instance after 15 minutes to prevent a section
    from being locked forever, requiring manual interaction to cleanup.
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/debian/changelog b/debian/changelog
index ff41967..26a52c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ piuparts (0.52) UNRELEASED; urgency=low
   * distros.conf:
   * piupartslib/conf.py:
   * piupartslib/packagesdb.py:
+  * piuparts-master.in:
+    - Use timeout to prevent master from getting stuck.  (Closes: #701618)
   * piuparts-master-backend.py:
   * piuparts-slave.py:
     - Report upgrade tests involving downgrades as untestable.
diff --git a/piuparts-master.in b/piuparts-master.in
index f269ac3..b4da433 100755
--- a/piuparts-master.in
+++ b/piuparts-master.in
@@ -38,4 +38,4 @@ cd "$MASTER"
 
 trap "test -s ${LOGFILE} || rm -f ${LOGFILE}" EXIT
 
- at sharedir@/piuparts/piuparts-master-backend 2> "$LOGFILE"
+timeout 15m @sharedir@/piuparts/piuparts-master-backend 2> "$LOGFILE"

-- 
piuparts git repository