diff options
Diffstat (limited to 'src/pacman')
| -rw-r--r-- | src/pacman/conf.h | 1 | ||||
| -rw-r--r-- | src/pacman/pacman.c | 5 | ||||
| -rw-r--r-- | src/pacman/query.c | 29 |
3 files changed, 0 insertions, 35 deletions
diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 2f4b0bc4..85889d19 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -48,7 +48,6 @@ typedef struct __config_t { unsigned short op_q_owns; unsigned short op_q_search; unsigned short op_q_changelog; - unsigned short op_q_test; unsigned short op_q_upgrade; unsigned short op_s_clean; diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 138389fa..2b748a1c 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -121,7 +121,6 @@ static void usage(int op, char *myname) printf(_(" -s, --search <regex> search locally-installed packages for matching strings\n")); printf(_(" -t, --orphans list all packages not required by any package\n")); printf(_(" -u, --upgrades list all packages that can be upgraded\n")); - printf(_(" --test check the consistency of the local database\n")); } else if(op == PM_OP_SYNC) { printf("%s: %s {-S --sync} [%s] [%s]\n", str_usg, myname, str_opt, str_pkg); printf("%s:\n", str_opt); @@ -284,7 +283,6 @@ static int parseargs(int argc, char *argv[]) {"ask", required_argument, 0, 1006}, {"cachedir", required_argument, 0, 1007}, {"asdeps", no_argument, 0, 1008}, - {"test", no_argument, 0, 1009}, {0, 0, 0, 0} }; @@ -338,9 +336,6 @@ static int parseargs(int argc, char *argv[]) case 1008: config->flags |= PM_TRANS_FLAG_ALLDEPS; break; - case 1009: - config->op_q_test = 1; - break; case 'A': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_ADD); break; case 'F': config->op = (config->op != PM_OP_MAIN ? 0 : PM_OP_UPGRADE); diff --git a/src/pacman/query.c b/src/pacman/query.c index 476ca152..26a1bd8f 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -213,29 +213,6 @@ static int query_group(alpm_list_t *targets) return ret; } -static int query_test(void) -{ - int ret = 0; - alpm_list_t *testlist; - - printf(_("Checking database for consistency... ")); - testlist = alpm_db_test(db_local); - if(testlist == NULL) { - printf(_("check complete.\n")); - return(0); - } else { - /* on failure, increment the ret val by 1 for each failure */ - alpm_list_t *i; - printf(_("check failed!\n")); - fflush(stdout); - for(i = testlist; i; i = alpm_list_next(i)) { - fprintf(stderr, "%s\n", (char*)alpm_list_getdata(i)); - ret++; - } - return(ret); - } -} - static int query_upgrades(void) { alpm_list_t *syncpkgs; @@ -338,12 +315,6 @@ int pacman_query(alpm_list_t *targets) return(ret); } - /* check DB consistancy */ - if(config->op_q_test) { - ret = query_test(); - return(ret); - } - /* check for package upgrades */ if(config->op_q_upgrade) { ret = query_upgrades(); |