[Piuparts-commits] [SCM] piuparts git repository branch, develop, updated. 0.49-60-g87e23c3

[Andreas Beckmann]

The following commit has been merged in the develop branch:
commit 5169d0cc29f0bfc3c2d28c25e9dc415be2b8768f
Author: Andreas Beckmann <anbe at debian.org>
Date:   Tue Feb 5 15:37:50 2013 +0100

    p-s: be less strict in package existence checks
    
    allow distupgrading from missing, e.g. if a new package was introduced
    in backports - and trust the master to only hand out sane requests
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 9f002c0..05ef9b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ piuparts (0.50) UNRELEASED; urgency=low
   * piuparts-master.py:
   * piuparts-slave.py:
     - Tarball recreation can be disabled by setting max-tgz-age to 0.
+    - Relax package existence checks to allow distupgrading to backports.
   * piuparts-analyze.py:
     - Add support for magic "$DISTRO/None" versions.
   * piuparts-report.py:
diff --git a/piuparts-slave.py b/piuparts-slave.py
index 3ee8949..14e8f34 100644
--- a/piuparts-slave.py
+++ b/piuparts-slave.py
@@ -669,15 +669,15 @@ def test_package(config, pname, pvers, packages_files):
     if ret == 0 and config["upgrade-test-chroot-tgz"]:
         distros = config["upgrade-test-distros"].split()
         if distros:
-            # the package must exist in at least one of the older distros
-            for distro in distros[:-1]:
+            # the package must exist somewhere
+            for distro in distros:
                 if pname in packages_files[distro]:
                     break
             else:
-                output.write("Package %s not found in any old distribution\n" % pname)
+                output.write("Package %s not found in any distribution\n" % pname)
                 ret = -10003
 
-            # and (usually) in the target distro
+            # the package must have the correct version in the distupgrade target distro
             distro = distros[-1]
             if not pname in packages_files[distro]:
                 # the package may "disappear" in the distupgrade target distro

-- 
piuparts git repository