[Piuparts-commits] [SCM] piuparts git repository branch, piatti, updated. 389270785fa684c193e7e386d0aae9c1f12f54b6

[Andreas Beckmann]

The following commit has been merged in the piatti branch:
commit 389270785fa684c193e7e386d0aae9c1f12f54b6
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Tue Dec 6 15:58:04 2011 +0100

    correctly store the diversions in distupgrade tests
    
    ... do not attach them to the first chroot instance that did the
    clean distupgrade test without package-under-test ...
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/piuparts.py b/piuparts.py
index b9310ee..b2c74d4 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -2081,7 +2081,7 @@ def install_and_upgrade_between_distros(package_files, packages):
         # set root_info and selections
         root_info = chroot.save_meta_data()
         selections = chroot.get_selections()
-        chroot.pre_install_diversions = chroot.get_diversions()
+        diversions = chroot.get_diversions()
 
         if settings.save_end_meta:
             # save root_info and selections
@@ -2100,6 +2100,7 @@ def install_and_upgrade_between_distros(package_files, packages):
         else:
             chroot.create(temp_tgz)
             chroot.remove_temp_tgz_file(temp_tgz)
+        chroot.pre_install_diversions = diversions
         cid = do_on_panic(chroot.remove)
 
     chroot.check_for_no_processes()

-- 
piuparts git repository