[Piuparts-commits] [SCM] piuparts git repository branch, master, updated. 0.51

[Andreas Beckmann]

The following commit has been merged in the master branch:
commit 97ed3be77c807ea2bca6ab440a3b292472e940a3
Author: Andreas Beckmann <anbe at debian.org>
Date:   Mon Mar 18 09:42:23 2013 +0100

    p-s: fix parsing 'idle' return value from master
    
    do not crash if there is no time value returned
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/debian/changelog b/debian/changelog
index c001502..1c27434 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ piuparts (0.51) UNRELEASED; urgency=low
       logging. No longer uses the section specific logfile name for errors.
   * piuparts-master-backend.py:
   * piuparts-slave.py:
+    - Fix parsing 'idle' return value from master.
     - Let the piuparts-master (wrapper script) handle chdir and error logging.
   * piuparts-analyze.py:
   * piuparts-report.py:
diff --git a/piuparts-slave.py b/piuparts-slave.py
index dffadae..9020fd6 100644
--- a/piuparts-slave.py
+++ b/piuparts-slave.py
@@ -258,7 +258,7 @@ class Slave:
         self._writeline("idle")
         line = self._readline()
         words = line.split()
-        if words and words[0] == "ok":
+        if words and words[0] == "ok" and len(words) == 2:
             return int(words[1])
         else:
             raise MasterIsCrazy()

-- 
piuparts git repository