From 047b1efbfe6f14a71432e27baa7c55fe7819e219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Minier?= 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-updatebuildenv | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'pbuilder-updatebuildenv') 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