[Piuparts-commits] [SCM] piuparts git repository branch, master, updated. eda668423fa87898c59d1075118693714aa5a053

[Andreas Beckmann]

The following commit has been merged in the master branch:
commit 49cfd285206f6265f9679fbdf9aac76bdab6f6dc
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Mon Nov 28 12:57:59 2011 +0100

    separately test for settings.args_are_package_files
    
    Make the test for settings.args_are_package_files before running
    install_upgrade_test its own if/else block.
    Later patches will add extra code in case we are going to run the tests.
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/piuparts.py b/piuparts.py
index 33ebd4d..860a5f0 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -2510,14 +2510,15 @@ def process_packages(package_list):
         if not settings.no_upgrade_test:
             if not settings.args_are_package_files:
                 logging.info("Can't test upgrades: -a or --apt option used.")
-            elif not chroot.apt_get_knows(packages):
-                logging.info("Can't test upgrade: packages not known by apt-get.")
-            elif install_upgrade_test(chroot, root_info, selections, package_files,
-                                  packages):
-                logging.info("PASS: Installation, upgrade and purging tests.")
             else:
-                logging.error("FAIL: Installation, upgrade and purging tests.")
-                panic()
+                if not chroot.apt_get_knows(packages):
+                    logging.info("Can't test upgrade: packages not known by apt-get.")
+                elif install_upgrade_test(chroot, root_info, selections, package_files,
+                                      packages):
+                    logging.info("PASS: Installation, upgrade and purging tests.")
+                else:
+                    logging.error("FAIL: Installation, upgrade and purging tests.")
+                    panic()
 
         chroot.remove()
         dont_do_on_panic(cid)

-- 
piuparts git repository