Re: [pacman-dev] [PATCH] Remove ALPM_QUESTION_LOCAL_NEWER

On 17/04/13 19:40, Connor Behan wrote:

It seems this question has not been used since the 3.0 days.

Signed-off-by: Connor Behan --- lib/libalpm/alpm.h | 7 +++---- src/pacman/callback.c | 9 --------- 2 files changed, 3 insertions(+), 13 deletions(-)

This requires some more work: -------------------------------------------------------------------------------- Failed: [FAIL] ignore005 Rules: OK = 2 FAIL = 4 SKIP = 0 Sync with ignore causing top-level to be included [FAIL] sync140 Rules: OK = 2 FAIL = 2 SKIP = 0 Sysupgrade with ignored package prevent other upgrade [FAIL] sync141 Rules: OK = 2 FAIL = 2 SKIP = 0 Sysupgrade with ignored package prevent other upgrade [FAIL] unresolvable001 Rules: OK = 2 FAIL = 2 SKIP = 0 An unresolvable dependency [FAIL] upgrade090 Rules: OK = 1 FAIL = 8 SKIP = 0 -U syncdeps test -------------------------------------------------------------------------------- Total = 284 Pass = 270 ( 95.07%) Expected Fail = 9 ( 3.17%) Unexpected Pass = 0 ( 0.00%) Fail = 5 ( 1.76%)

diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index ccbdd1c..2277a69 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 16d66df..a743adc 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?"),