[Piuparts-commits] [SCM] piuparts git repository branch, master, updated. 0.47-41-ga9fc1b0

[Andreas Beckmann]

The following commit has been merged in the master branch:
commit 95dc44f1f3d7a3485a41834500dfa11653b67a0b
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Fri Nov 2 20:55:49 2012 +0100

    p: simplify some --install-remove-install special cases
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/piuparts.py b/piuparts.py
index 7db559e..bff77bf 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -2296,20 +2296,19 @@ def install_and_upgrade_between_distros(package_files, packages_qualified):
 
     os.environ["PIUPARTS_PHASE"] = "install"
 
+    distupgrade_packages = packages
     known_packages = chroot.get_known_packages(packages + settings.extra_old_packages)
     chroot.install_packages_by_name(known_packages)
 
     if settings.install_remove_install:
         chroot.remove_packages(packages)
+        distupgrade_packages = []
 
     chroot.check_for_no_processes()
 
     os.environ["PIUPARTS_PHASE"] = "distupgrade"
 
-    if not settings.install_remove_install:
-        chroot.upgrade_to_distros(settings.debian_distros[1:], packages)
-    else:
-        chroot.upgrade_to_distros(settings.debian_distros[1:], [])
+    chroot.upgrade_to_distros(settings.debian_distros[1:], distupgrade_packages)
 
     chroot.check_for_no_processes()
 

-- 
piuparts git repository