Remove ALPM_QUESTION_LOCAL_NEWER

Remove a question that hasn't been used since the 3.0 days. To prevent
us from having an ugly enum of questions that is missing a bitmask, this
changes the API of the hidden --ask option.

Signed-off-by: Connor Behan <connor.behan@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>

7 files changed, 8 insertions, 18 deletions

diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
index ccbdd1c6..2277a69c 100644
--- a/lib/libalpm/alpm.h
+++ b/lib/libalpm/alpm.h
@@ -405,10 +405,9 @@ typedef enum _alpm_question_t {
 	ALPM_QUESTION_REPLACE_PKG = (1 << 1),
 	ALPM_QUESTION_CONFLICT_PKG = (1 << 2),
 	ALPM_QUESTION_CORRUPTED_PKG = (1 << 3),
-	ALPM_QUESTION_LOCAL_NEWER = (1 << 4),
-	ALPM_QUESTION_REMOVE_PKGS = (1 << 5),
-	ALPM_QUESTION_SELECT_PROVIDER = (1 << 6),
-	ALPM_QUESTION_IMPORT_KEY = (1 << 7)
+	ALPM_QUESTION_REMOVE_PKGS = (1 << 4),
+	ALPM_QUESTION_SELECT_PROVIDER = (1 << 5),
+	ALPM_QUESTION_IMPORT_KEY = (1 << 6)
 } alpm_question_t;
 
 /** Question callback */
diff --git a/src/pacman/callback.c b/src/pacman/callback.c
index 16d66df7..a743adc3 100644
--- a/src/pacman/callback.c
+++ b/src/pacman/callback.c
@@ -382,15 +382,6 @@ void cb_question(alpm_question_t event, void *data1, void *data2,
 				*response = select_question(count);
 			}
 			break;
-		case ALPM_QUESTION_LOCAL_NEWER:
-			if(!config->op_s_downloadonly) {
-				*response = yesno(_("%s-%s: local version is newer. Upgrade anyway?"),
-						alpm_pkg_get_name(data1),
-						alpm_pkg_get_version(data1));
-			} else {
-				*response = 1;
-			}
-			break;
 		case ALPM_QUESTION_CORRUPTED_PKG:
 			*response = yesno(_("File %s is corrupted (%s).\n"
 						"Do you want to delete it?"),
diff --git a/test/pacman/tests/ignore005.py b/test/pacman/tests/ignore005.py
index 274e44c3..51bcba39 100644
--- a/test/pacman/tests/ignore005.py
+++ b/test/pacman/tests/ignore005.py
@@ -36,7 +36,7 @@ self.addpkg2db("sync", packageA5up)
 
 
 self.option["IgnorePkg"] = ["packageA3"]
-self.args = "-S packageA1 packageA2 --ask=32"
+self.args = "-S packageA1 packageA2 --ask=16"
 
 self.addrule("PACMAN_RETCODE=0")
 self.addrule("PKG_VERSION=packageA1|1.0-1")
diff --git a/test/pacman/tests/sync140.py b/test/pacman/tests/sync140.py
index ce21cc33..fbe750f2 100644
--- a/test/pacman/tests/sync140.py
+++ b/test/pacman/tests/sync140.py
@@ -18,7 +18,7 @@ sp3.depends = ["gcc-libs"]
 for p in sp1, sp2, sp3:
 	self.addpkg2db("sync", p)
 
-self.args = "-Su --ignore %s --ask=32" % sp1.name
+self.args = "-Su --ignore %s --ask=16" % sp1.name
 
 self.addrule("PACMAN_RETCODE=0")
 self.addrule("PKG_VERSION=glibc|1.0-1")
diff --git a/test/pacman/tests/sync141.py b/test/pacman/tests/sync141.py
index f2f01364..02f7be81 100644
--- a/test/pacman/tests/sync141.py
+++ b/test/pacman/tests/sync141.py
@@ -18,7 +18,7 @@ sp3.depends = ["b_gcc-libs"]
 for p in sp1, sp2, sp3:
 	self.addpkg2db("sync", p)
 
-self.args = "-Su --ignore %s --ask=32" % sp1.name
+self.args = "-Su --ignore %s --ask=16" % sp1.name
 
 self.addrule("PACMAN_RETCODE=0")
 self.addrule("PKG_VERSION=c_glibc|1.0-1")
diff --git a/test/pacman/tests/unresolvable001.py b/test/pacman/tests/unresolvable001.py
index 9d54c3e5..4e5da6f3 100644
--- a/test/pacman/tests/unresolvable001.py
+++ b/test/pacman/tests/unresolvable001.py
@@ -11,7 +11,7 @@ packageA2up = pmpkg("package")
 packageA2up.depends = ["dep"];
 self.addpkg2db("sync", packageA2up)
 
-self.args = "-S package dep --ask=32"
+self.args = "-S package dep --ask=16"
 
 self.addrule("PACMAN_RETCODE=0")
 self.addrule("PKG_EXIST=package")
diff --git a/test/pacman/tests/upgrade090.py b/test/pacman/tests/upgrade090.py
index 26e531c9..cdd4cace 100644
--- a/test/pacman/tests/upgrade090.py
+++ b/test/pacman/tests/upgrade090.py
@@ -16,7 +16,7 @@ sp = pmpkg("dep")
 sp.files = ["bin/dep"]
 self.addpkg2db("sync", sp)
 
-self.args = "-U %s --ask=32" % " ".join([p.filename() for p in p1, p2, p3])
+self.args = "-U %s --ask=16" % " ".join([p.filename() for p in p1, p2, p3])
 
 self.addrule("PACMAN_RETCODE=0")
 for p in p1, p2, sp: