diff options
| author | Michael Vogt <mvo@debian.org> | 2014-02-27 22:52:34 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-02-27 22:52:34 +0100 |
| commit | fce69e7a0f38299c57ef96ae1c1dd9a5379bfd5a (patch) | |
| tree | be7d18baa836e9df166ec63f6c9fe6f94bb84b40 /dselect/install | |
| parent | a5e790985752c6820e08e7a7e650e1607fa826e4 (diff) | |
| parent | fc104da6a583736223b2f941e43a05ea26b63a7d (diff) | |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
apt-private/private-list.cc
configure.ac
debian/apt.install.in
debian/changelog
Diffstat (limited to 'dselect/install')
| -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 |