Commit 2305a427 authored by Christian PERRIER's avatar Christian PERRIER

Use apt-get to upgrade instead of aptitude, making things consistent with tasksel behaviour.

parent f80d218a
pkgsel (0.37) UNRELEASED; urgency=low
[ Daniel Hartwig ]
* Use apt-get to upgrade instead of aptitude, making things
consistent with tasksel behaviour.
-- Christian Perrier <bubulle@debian.org> Thu, 09 Aug 2012 19:23:24 +0200
pkgsel (0.36) unstable; urgency=low
* Team upload
......
......@@ -76,13 +76,18 @@ if [ "$RET" = none ]; then
tasksel_start=50
else
upgrade_type="$RET"
# Convert to apt-get command names.
case "$RET" in
safe-upgrade) upgrade_type=upgrade;;
full-upgrade) upgrade_type=dist-upgrade;;
esac
db_progress INFO pkgsel/progress/upgrade
sleep 2 # allow the message to be seen
log "checking for (security) updates to the base system"
# Exclude Recommends to avoid installing new packages as part of
# an upgrade.
in-target sh -c "debconf-apt-progress --from 50 --to 100 --logstderr -- aptitude -q --without-recommends -y -o DPkg::options=--force-confnew '$upgrade_type'" || aptfailed
in-target sh -c "debconf-apt-progress --from 50 --to 100 --logstderr -- apt-get -q --no-install-recommends -y -o DPkg::options=--force-confnew '$upgrade_type'" || aptfailed
tasksel_start=100
fi
......@@ -145,7 +150,7 @@ if [ "$RET" ]; then
# Allow comma-separation so that this can more easily be preseeded
# at the kernel command line.
RET="$(printf '%s' "$RET" | sed 's/,/ /g')"
in-target sh -c "debconf-apt-progress --from 900 --to 950 --logstderr -- aptitude -q -y install -- $RET" || aptfailed
in-target sh -c "debconf-apt-progress --from 900 --to 950 --logstderr -- apt-get -q -y install -- $RET" || aptfailed
fi
log "finishing up"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment