[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.49-167-gc2d72c8

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit dba46579e1afe5a5b3b796f39710b204a03b5e3b
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sun Mar 3 22:44:59 2013 +0100

    p-s: simplify package existence checks
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/piuparts-slave.py b/piuparts-slave.py
index 35da6e9..fc55e42 100644
--- a/piuparts-slave.py
+++ b/piuparts-slave.py
@@ -617,7 +617,7 @@ class Section:
 
         subdir = "fail"
 
-        if ret == 0 and not distupgrade:
+        if not distupgrade:
             distro = self._config.get_distro()
             if not pname in packages_files[distro]:
                 output.write("Package %s not found in %s\n" % (pname, distro))
@@ -630,10 +630,7 @@ class Section:
                 output.write("\n")
                 package.dump(output)
                 output.write("\n")
-            if ret != 0:
-                subdir = "untestable"
-
-        if ret == 0 and distupgrade:
+        else:
             distros = self._config.get_distros()
             if distros:
                 # the package must exist somewhere
@@ -666,8 +663,8 @@ class Section:
                 output.write("\n")
             else:
                 ret = -10010
-            if ret != 0:
-                subdir = "untestable"
+        if ret != 0:
+            subdir = "untestable"
 
         if ret == 0:
             output.write("Executing: %s\n" % " ".join(command))

-- 
piuparts git repository