diff options
| author | Michael Vogt <mvo@debian.org> | 2013-08-28 12:46:49 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-08-28 12:46:49 +0200 |
| commit | dbf8fc0419831c83e83165de8c434782165aa400 (patch) | |
| tree | 34d001d09adba9cded4658a506741e949827bfff /dselect | |
| parent | 2004d64720b396ae2dc9d2a7f6bf7859d6d7ee9b (diff) | |
| parent | 45dc05ff2f51612945232dac469ac1c6926d4019 (diff) | |
Merge remote-tracking branch 'upstream/debian/sid' into feature/upgrade-with-new
Diffstat (limited to 'dselect')
| -rwxr-xr-x | dselect/install | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/dselect/install b/dselect/install index 3ef213550..7104ee280 100755 --- a/dselect/install +++ b/dselect/install @@ -5,7 +5,8 @@ TEXTDOMAIN="apt" # Get the configuration from /etc/apt/apt.conf CLEAN="prompt" -OPTS="-f" +OPTS="" +DSELECT_UPGRADE_OPTS="-f" APTGET="/usr/bin/apt-get" DPKG="/usr/bin/dpkg" DPKG_OPTS="--admindir=$1" @@ -47,12 +48,12 @@ yesno() { } if [ "$WAIT" = "true" ]; then - $APTGET $OPTS "$APT_OPT0" "$APT_OPT1" -d dselect-upgrade + $APTGET $DSELECT_UPGRADE_OPTS $OPTS "$APT_OPT0" "$APT_OPT1" -d dselect-upgrade echo $"Press enter to continue." && read RES - $APTGET $OPTS "$APT_OPT0" "$APT_OPT1" dselect-upgrade + $APTGET $DSELECT_UPGRADE_OPTS $OPTS "$APT_OPT0" "$APT_OPT1" dselect-upgrade RES=$? else - $APTGET $OPTS "$APT_OPT0" "$APT_OPT1" dselect-upgrade + $APTGET $DSELECT_UPGRADE_OPTS $OPTS "$APT_OPT0" "$APT_OPT1" dselect-upgrade RES=$? fi |