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

[Andreas Beckmann]

The following commit has been merged in the master branch:
commit a53f61a20850baa93da10609b436f94d7296b083
Author: Andreas Beckmann <debian at abeckmann.de>
Date:   Sun Nov 6 15:26:43 2011 +0100

    synchronize cleanup checks between install_{purge,upgrade}_test
    
    run check_for_no_processes() and check_for_broken_symlinks() before removal
    and again after purge, no need to do this differently for install_purge_test
    and install_upgrade_test
    
    Signed-off-by: Andreas Beckmann <debian at abeckmann.de>

diff --git a/piuparts.py b/piuparts.py
index fd598b7..d719cf8 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -1880,6 +1880,7 @@ def install_purge_test(chroot, root_info, selections, package_files, packages):
     # Remove all packages from the chroot that weren't there initially.    
     chroot.restore_selections(selections, packages)
 
+    chroot.check_for_no_processes()
     chroot.check_for_broken_symlinks()
 
     return check_results(chroot, root_info, file_owners, deps_info=deps_info)
@@ -1894,11 +1895,15 @@ def install_upgrade_test(chroot, root_info, selections, package_files, packages)
 
     chroot.run_scripts("pre_upgrade")
 
+    chroot.check_for_no_processes()
     chroot.check_for_broken_symlinks()
 
     # Then from the package files.
     chroot.install_package_files(package_files)
 
+    chroot.check_for_no_processes()
+    chroot.check_for_broken_symlinks()
+
     file_owners = chroot.get_files_owned_by_packages()
 
     # Remove all packages from the chroot that weren't there initially.
@@ -1969,6 +1974,8 @@ def install_and_upgrade_between_distros(package_files, packages):
     else:
         chroot.upgrade_to_distros(settings.debian_distros[1:], [])
 
+        chroot.check_for_no_processes()
+
         # set root_info and selections
         root_info = chroot.save_meta_data()
         selections = chroot.get_selections()

-- 
piuparts git repository