Add aptitude if pbuilder-satisfydepends uses it

Install aptitude (with no possibility to override this) if
pbuilder-satisfydepends uses it; closes: 539578.

2 files changed, 8 insertions, 1 deletions

diff --git a/pbuilder-createbuildenv b/pbuilder-createbuildenv
index 48b0c05..1fc3f15 100755
--- a/pbuilder-createbuildenv
+++ b/pbuilder-createbuildenv
@@ -91,6 +91,13 @@ if [ -n "$REMOVEPACKAGES" ]; then
 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
+  *-aptitude)
+    EXTRAPACKAGES="$EXTRAPACKAGES aptitude"
+  ;;
+esac
+
 $CHROOTEXEC /usr/bin/apt-get -q -y --force-yes install build-essential dpkg-dev $EXTRAPACKAGES
 save_aptcache
 
diff --git a/pbuilderrc b/pbuilderrc
index 4aa952f..ec06a95 100755
--- a/pbuilderrc
+++ b/pbuilderrc
@@ -2,7 +2,7 @@
 # pbuilderrc.5 for documentation
 
 BASETGZ=/var/cache/pbuilder/base.tgz
-EXTRAPACKAGES="aptitude"
+#EXTRAPACKAGES=""
 #export DEBIAN_BUILDARCH=athlon
 BUILDPLACE=/var/cache/pbuilder/build/
 MIRRORSITE=http://cdn.debian.net/debian