aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xpbuilder-createbuildenv15
-rwxr-xr-xpbuilder-satisfydepends-aptitude1
-rwxr-xr-xpbuilder-updatebuildenv10
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