diff options
Diffstat (limited to 'pbuilder-createbuildenv')
| -rwxr-xr-x | pbuilder-createbuildenv | 15 |
1 files changed, 9 insertions, 6 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 |