From 047b1efbfe6f14a71432e27baa7c55fe7819e219 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Minier?= <lool@dooz.org>
Date: Sat, 2 Jan 2010 15:33:06 +0100
Subject: Only remove/install aptitude on create/update

Only install aptitude in pbuilder-createbuildenv or
pbuilder-updatebuildenv, not in pbuilder-satisfydepends-aptitude, and
only when $PBUILDERSATISFYDEPENDSCMD uses aptitude.  Remove aptitude in
pbuilder-createbuildenv and pbuilder-updatebuildenv otherwise;
closes: #539578.
---
 pbuilder-createbuildenv          | 15 +++++++++------
 pbuilder-satisfydepends-aptitude |  1 -
 pbuilder-updatebuildenv          | 10 ++++++++++
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv
index 1fc3f15..e187e7b 100755
--- a/pbuilder-createbuildenv
+++ b/pbuilder-createbuildenv
@@ -86,18 +86,21 @@ log "I: upgrading packages"
 mountproc
 $TRAP umountproc_cleanbuildplace_trap exit sighup
 $CHROOTEXEC /usr/bin/apt-get -q update
-if [ -n "$REMOVEPACKAGES" ]; then
-    $CHROOTEXEC /usr/bin/dpkg --purge $REMOVEPACKAGES
-fi
-recover_aptcache
-$CHROOTEXEC /usr/bin/apt-get -q -y --force-yes "${FORCE_CONFNEW[@]}" dist-upgrade
 
-case `readlink -e /usr/lib/pbuilder/pbuilder-satisfydepends` in
+case "`readlink -e "$PBUILDERSATISFYDEPENDSCMD"`" in
   *-aptitude)
     EXTRAPACKAGES="$EXTRAPACKAGES aptitude"
   ;;
+  *)
+    REMOVEPACKAGES="$REMOVEPACKAGES aptitude"
+  ;;
 esac
 
+if [ -n "$REMOVEPACKAGES" ]; then
+    $CHROOTEXEC /usr/bin/dpkg --purge $REMOVEPACKAGES
+fi
+recover_aptcache
+$CHROOTEXEC /usr/bin/apt-get -q -y --force-yes "${FORCE_CONFNEW[@]}" dist-upgrade
 $CHROOTEXEC /usr/bin/apt-get -q -y --force-yes install build-essential dpkg-dev $EXTRAPACKAGES
 save_aptcache
 
diff --git a/pbuilder-satisfydepends-aptitude b/pbuilder-satisfydepends-aptitude
index 8e0c4e2..d685477 100755
--- a/pbuilder-satisfydepends-aptitude
+++ b/pbuilder-satisfydepends-aptitude
@@ -85,7 +85,6 @@ EOF
     fi
     $CHROOTEXEC sh -c "cat \"$BUILD_DEP_DEB_CONTROL\""
     $CHROOTEXEC sh -c "dpkg-deb -b \"$BUILD_DEP_DEB_DIR/pbuilder-satisfydepends-dummy\""
-    $CHROOTEXEC apt-get -q -y --force-yes install aptitude
     $CHROOTEXEC dpkg -i "$BUILD_DEP_DEB_DIR/pbuilder-satisfydepends-dummy.deb" || true
     $CHROOTEXEC aptitude -y --without-recommends -o APT::Install-Recommends=false -o Aptitude::CmdLine::Ignore-Trust-Violations=true -o Aptitude::ProblemResolver::StepScore=100 install pbuilder-satisfydepends-dummy
     # check whether the aptitude's resolver kept the package
diff --git a/pbuilder-updatebuildenv b/pbuilder-updatebuildenv
index 874b7ce..25bcf05 100755
--- a/pbuilder-updatebuildenv
+++ b/pbuilder-updatebuildenv
@@ -38,6 +38,16 @@ loadhooks
 log "I: Refreshing the base.tgz "
 log "I: upgrading packages"
 $CHROOTEXEC /usr/bin/apt-get -q update
+
+case "`readlink -e "$PBUILDERSATISFYDEPENDSCMD"`" in
+  *-aptitude)
+    EXTRAPACKAGES="$EXTRAPACKAGES aptitude"
+  ;;
+  *)
+    REMOVEPACKAGES="$REMOVEPACKAGES aptitude"
+  ;;
+esac
+
 if [ -n "$REMOVEPACKAGES" ]; then
     $CHROOTEXEC /usr/bin/dpkg --purge $REMOVEPACKAGES
 fi
-- 
cgit v1.2.3