[Piuparts-devel] [PATCH] synchronize cleanup checks between install_{purge, upgrade}_test
Andreas Beckmann
debian at abeckmann.de
Sat Nov 5 22:57:15 UTC 2011
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>
---
piuparts.py | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/piuparts.py b/piuparts.py
index a731af2..6bd6034 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -1744,6 +1744,7 @@ def install_purge_test(chroot, root_info, selections, package_list, packages):
changes = diff_selections(chroot, selections)
chroot.restore_selections(changes, packages)
+ chroot.check_for_no_processes()
chroot.check_for_broken_symlinks()
return check_results(chroot, root_info, file_owners, deps_info=deps_info)
@@ -1759,10 +1760,14 @@ def install_upgrade_test(chroot, root_info, selections, package_list, package_na
if settings.scriptsdir is not None:
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_list)
+
+ chroot.check_for_no_processes()
+ chroot.check_for_broken_symlinks()
file_owners = chroot.get_files_owned_by_packages()
@@ -1837,6 +1842,8 @@ def install_and_upgrade_between_distros(filenames, packages):
chroot.upgrade_to_distros(settings.debian_distros[1:], [])
chroot.run(["apt-get", "clean"])
+ chroot.check_for_no_processes()
+
# set root_info and selections
root_info = chroot.save_meta_data()
selections = chroot.get_selections()
--
tg: (3283f11..) t/feat/check-broken-symlinks-after-upgrade (depends on: develop)
More information about the Piuparts-devel
mailing list