[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.48-19-g93bfc2b

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit 4166c5ecfdafa086ecc2fc3c35b1adb6d5f4fe94
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Mon Nov 5 19:08:57 2012 +0100

    p-s: support dist-upgrades of disappearing packages
    
    indicated with pseudo-version "None"
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/debian/changelog b/debian/changelog
index f17a6a2..fc1beb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ piuparts (0.49) UNRELEASED; urgency=low
   * piuparts-slave.py:
     - Disable X forwarding while connecting to master.
     - Move checks for package existence to test_package().
+    - Add support for distupgrade tests of disappearing packages (with
+      pseudo-version "None").
   * piuparts-report.py:
     - Hardlink the logfiles to the htdocs tree (with copy as fallback).
   * pre_remove_50_find_missing_copyright: Skip check for packages that are not
diff --git a/piuparts-slave.py b/piuparts-slave.py
index 395f51c..1cf8df4 100644
--- a/piuparts-slave.py
+++ b/piuparts-slave.py
@@ -677,6 +677,10 @@ def test_package(config, pname, pvers, packages_files):
             # and (usually) in the target distro
             distro = distros[-1]
             if not pname in packages_files[distro]:
+                # the package may "disappear" in the distupgrade target distro
+                if pvers == "None":
+                    pass
+                else:
                     output.write("Package %s not found in %s\n" % (pname, distro))
                     ret = -10004
             else:

-- 
piuparts git repository