[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.46-27-g960eea7

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit 5cc3796412235996c4dda8395a992bdf98b2c7a5
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Wed Sep 19 08:07:06 2012 +0200

    p-s: ensure piuparts output is newline terminated
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/piuparts-slave.py b/piuparts-slave.py
index b65556b..53b8935 100644
--- a/piuparts-slave.py
+++ b/piuparts-slave.py
@@ -661,10 +661,11 @@ def test_package(config, package, packages_files):
 
         output.write("Executing: %s\n" % " ".join(command))
         ret,f = run_test_with_timeout(command, MAX_WAIT_TEST_RUN)
+        if not f or f[-1] != '\n':
+            f += '\n'
+        output.write(f)
         if ret < 0:
-            output.write(f + "\n *** Process KILLED - exceed maximum run time ***\n")
-        else:
-            output.write(f)
+            output.write(" *** Process KILLED - exceed maximum run time ***\n")
 
     if ret == 0 and config["upgrade-test-chroot-tgz"] and upgrade_testable(config, package, packages_files):
         command = base_command[:]
@@ -675,10 +676,11 @@ def test_package(config, package, packages_files):
 
         output.write("Executing: %s\n" % " ".join(command))
         ret,f = run_test_with_timeout(command, MAX_WAIT_TEST_RUN)
+        if not f or f[-1] != '\n':
+            f += '\n'
+        output.write(f)
         if ret < 0:
             output.write(" *** Process KILLED - exceed maximum run time ***\n")
-        else:
-            output.write(f)
 
     output.write("\n")
     output.write("ret=%d\n" % ret)

-- 
piuparts git repository