[Piuparts-commits] [piuparts] 14/20: p: remove the package-under-test before depends and recommends

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch develop
in repository piuparts.

commit dfbe13fc30fd69b7f91b823f35ca19a7303a5872
Author: Andreas Beckmann <anbe at debian.org>
Date:   Sun Nov 17 12:15:18 2013 +0100

    p: remove the package-under-test before depends and recommends
    
    especially with --enable-recommends the package-under-test may get
    removed too late
    
    Signed-off-by: Andreas Beckmann <anbe at debian.org>
---
 debian/changelog | 2 ++
 piuparts.py      | 1 +
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c3a9d4c..8e7b8a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ piuparts (0.56) UNRELEASED; urgency=low
     - Add to ignored_files:
       + /etc/apt/apt.conf.d/01autoremove-kernels
     - Use temporary files while creating basetgz and rename afterwards.
+    - Remove the package to be tested separately before removing its Depends
+      and Recommends.
   * piuparts.conf:
     - New per-section settings:
       + components
diff --git a/piuparts.py b/piuparts.py
index 4f48c7c..48c4426 100644
--- a/piuparts.py
+++ b/piuparts.py
@@ -1386,6 +1386,7 @@ class Chroot:
         self.run_scripts("pre_remove")
 
         # First remove all packages (and reinstall missing ones).
+        self.remove_packages(deps_to_remove)
         self.remove_packages(deps_to_remove + deps_to_purge +
                              nondeps_to_remove + nondeps_to_purge +
                              ["%s+" % x for x in deps_to_install])

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/piuparts/piuparts.git