From 046c8a6819a0533fb10434f30100f80bb960fe46 Mon Sep 17 00:00:00 2001 From: Chantry Xavier Date: Mon, 17 Sep 2007 01:56:23 +0200 Subject: Remove the DB consistency check from pacman and libalpm. This reverts commit dfc85cb5f516ffbcff557522e9703c5c7d88b047 and b6f3fe6957d0206485eac98fb2120578b75d0058. This DB check is already in testdb (among others). Also testdb now uses the db path set at make time by default, so specifying the db path is optional. Signed-off-by: Chantry Xavier Signed-off-by: Dan McGee --- src/pacman/conf.h | 1 - src/pacman/pacman.c | 5 ----- src/pacman/query.c | 29 ----------------------------- src/util/Makefile.am | 11 +++++++++++ src/util/testdb.c | 20 ++++++++++++-------- 5 files changed, 23 insertions(+), 43 deletions(-) (limited to 'src') 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 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(); diff --git a/src/util/Makefile.am b/src/util/Makefile.am index edc5a95d..97a0ffa1 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -1,5 +1,16 @@ +# paths set at make time +conffile = ${sysconfdir}/pacman.conf +dbpath = ${localstatedir}/lib/pacman/ +cachedir = ${localstatedir}/cache/pacman/pkg/ + bin_PROGRAMS = vercmp testpkg testdb +DEFS = -DLOCALEDIR=\"@localedir@\" \ + -DCONFFILE=\"$(conffile)\" \ + -DROOTDIR=\"$(ROOTDIR)\" \ + -DDBPATH=\"$(dbpath)\" \ + -DCACHEDIR=\"$(cachedir)\" \ + @DEFS@ INCLUDES = -I$(top_srcdir)/lib/libalpm AM_CFLAGS = -pedantic -D_GNU_SOURCE diff --git a/src/util/testdb.c b/src/util/testdb.c index a81a5e8b..d59d0108 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -135,19 +135,23 @@ int main(int argc, char **argv) { int retval = 0; /* default = false */ pmdb_t *db = NULL; - char dbpath[PATH_MAX]; + char *dbpath; + char localdbpath[PATH_MAX]; alpm_list_t *i; - if(argc != 2) { - fprintf(stderr, "usage: %s \n", basename(argv[0])); + if(argc == 1) { + dbpath = DBPATH; + } else if(argc == 3 && strcmp(argv[1], "-b") == 0) { + dbpath = argv[2]; + } else { + fprintf(stderr, "usage: %s -b \n", basename(argv[0])); return(1); } - snprintf(dbpath, PATH_MAX, "%s/local", argv[1]); - - retval = db_test(dbpath); + snprintf(localdbpath, PATH_MAX, "%s/local", dbpath); + retval = db_test(localdbpath); if(retval) { - exit(retval); + return(retval); } if(alpm_initialize() == -1) { @@ -158,7 +162,7 @@ int main(int argc, char **argv) /* let us get log messages from libalpm */ alpm_option_set_logcb(output_cb); - alpm_option_set_dbpath(argv[1]); + alpm_option_set_dbpath(dbpath); db = alpm_db_register_local(); if(db == NULL) { -- cgit v1.2.3-24-g4f1b