From 17e4360804ffd2b5530b8ceb0e42834eb99e526e Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Fri, 23 Aug 2013 13:44:21 +0200
Subject: dselect/update: remove "-f" option as its not being used in the
 context of apt-get update

---
 dselect/update | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'dselect')

diff --git a/dselect/update b/dselect/update
index 411033ca9..487fbf226 100755
--- a/dselect/update
+++ b/dselect/update
@@ -6,7 +6,7 @@ TEXTDOMAIN="apt"
 
 # Get the configuration from /etc/apt/apt.conf
 CLEAN="prompt"
-OPTS="-f"
+OPTS=""
 APTGET="/usr/bin/apt-get"
 APTCACHE="/usr/bin/apt-cache"
 DPKG="/usr/bin/dpkg"
-- 
cgit v1.2.3


From 11e6f40674631154a8db1082f6fbf42de3ce3092 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Mon, 26 Aug 2013 18:45:32 +0200
Subject: dselect/install:

* dselect/install:
 - remove "-f" option for apt-get dselect-upgrade (closes: #720532)
---
 dselect/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'dselect')

diff --git a/dselect/install b/dselect/install
index 3ef213550..e9974b23e 100755
--- a/dselect/install
+++ b/dselect/install
@@ -5,7 +5,7 @@ TEXTDOMAIN="apt"
 
 # Get the configuration from /etc/apt/apt.conf
 CLEAN="prompt"
-OPTS="-f"
+OPTS=""
 APTGET="/usr/bin/apt-get"
 DPKG="/usr/bin/dpkg"
 DPKG_OPTS="--admindir=$1"
-- 
cgit v1.2.3


From 0806f2a6c46f7f440aa80214cbcac80dd69e88be Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Mon, 26 Aug 2013 18:51:40 +0200
Subject: dselect/install: add new DSELECT_UPGRADE_OPTS="-f"

---
 dselect/install | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'dselect')

diff --git a/dselect/install b/dselect/install
index e9974b23e..7104ee280 100755
--- a/dselect/install
+++ b/dselect/install
@@ -6,6 +6,7 @@ TEXTDOMAIN="apt"
 # Get the configuration from /etc/apt/apt.conf
 CLEAN="prompt"
 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
 
-- 
cgit v1.2.3