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-satisfydepends-aptitude | 1 - 1 file changed, 1 deletion(-) (limited to 'pbuilder-satisfydepends-aptitude') 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 -- cgit v1.2.3