[Piuparts-commits] [SCM] piuparts git repository branch, master, updated. 0.48-79-gdf94975

[Andreas Beckmann]

The following commit has been merged in the master branch:
commit 78424c0d960dedca6e098d0429e42438836c7550
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Mon Nov 5 17:49:53 2012 +0100

    p-s: test_package: check existence before install-purge test
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/piuparts-slave.py b/piuparts-slave.py
index d504a29..673467e 100644
--- a/piuparts-slave.py
+++ b/piuparts-slave.py
@@ -662,6 +662,22 @@ def test_package(config, pname, pvers, packages_files, package):
     ret = 0
 
     if ret == 0 and config["chroot-tgz"]:
+        distro = config["distro"]
+        if not pname in packages_files[distro]:
+            output.write("Package %s not found in %s\n" % (pname, distro))
+            ret = -10001
+        else:
+            package = packages_files[distro][pname]
+            if pvers != package["Version"]:
+                output.write("Package %s %s not found in %s, %s is available\n" % (pname, pvers, distro, package["Version"]))
+                ret = -10002
+            output.write("\n")
+            package.dump(output)
+            output.write("\n")
+        if ret != 0:
+            subdir = "untestable"
+
+    if ret == 0 and config["chroot-tgz"]:
         command = base_command[:]
         command.extend(["-b", config["chroot-tgz"]])
         command.extend(["-d", config["distro"]])

-- 
piuparts git repository