add an additional test for arch specific conflicts

[apt.git] / dselect / install

diff --git a/dselect/install b/dselect/install
index 3ef213550d3ed28653d6e1d20c77e279047c855a..7104ee280cd74399ded16413023f840fe583492d 100755 (executable)
--- a/dselect/install
+++ b/dselect/install
@@ -5,7 +5,8 @@ TEXTDOMAIN="apt"
 
 # Get the configuration from /etc/apt/apt.conf
 CLEAN="prompt"
 
 # 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"
 APTGET="/usr/bin/apt-get"
 DPKG="/usr/bin/dpkg"
 DPKG_OPTS="--admindir=$1"


@@ -47,12 +48,12 @@ yesno() {
 }
 
 if [ "$WAIT" = "true" ]; then
 }
 
 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
    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
    RES=$?
 else

-   $APTGET $OPTS "$APT_OPT0" "$APT_OPT1" dselect-upgrade
+   $APTGET $DSELECT_UPGRADE_OPTS $OPTS "$APT_OPT0" "$APT_OPT1" dselect-upgrade

    RES=$?
 fi
 
    RES=$?
 fi