[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 0768dda87e91cc81b2a6d19dc892dce1537f4576
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Fri Dec 21 11:59:16 2012 +0100

    p: enable upgrade test with --apt and --testdeps-repo
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/debian/changelog b/debian/changelog
index b6377e1..0ebac8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ piuparts (0.49) UNRELEASED; urgency=low
     - Add --distupgrade-to-testdebs option. During distupgrade tests override
       packages from the target distro with the packages from the testdebs
       repository. This allows doing distupgrade tests before uploading.
+    - Enable upgrade tests if both --apt and --testdebs-repo are given.
   * piuparts.conf:
   * piupartslib/conf.py:
     - Add get_final_distro() method.
diff --git a/piuparts.py b/piuparts.py
index d50f1d7..ca9eaf4 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -2837,7 +2837,7 @@ def process_packages(package_list):
             logging.info("PASS: Installation and purging test.")
 
         if not settings.no_upgrade_test:
-            if not settings.args_are_package_files:
+            if not settings.args_are_package_files and not settings.testdebs_repo:
                 logging.info("Can't test upgrades: -a or --apt option used.")
             else:
                 packages_to_query = [p.split("=", 1)[0].strip() for p in packages]

-- 
piuparts git repository