diff options
author | Dan McGee <dan@archlinux.org> | 2009-08-18 20:49:25 -0500 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2009-08-18 20:49:25 -0500 |
commit | 92f0775e76c75ebe9e30355cc99bb40cf365abcb (patch) | |
tree | 6268a6ce1457109bf5878d3aa66bfbf3a5c5afe2 | |
parent | 7dae79e7b95c517df136003728363dc9ad346a7e (diff) | |
parent | bdd8e92ff601aab44941e7572f6c48d7e32a3f24 (diff) |
Merge branch 'maint'
Conflicts:
lib/libalpm/dload.c
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | lib/libalpm/dload.c | 4 | ||||
-rw-r--r-- | src/pacman/query.c | 12 | ||||
-rw-r--r-- | src/pacman/sync.c | 2 | ||||
-rw-r--r-- | src/util/testdb.c | 6 |
5 files changed, 17 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 90be362e..b2164b9e 100644 --- a/configure.ac +++ b/configure.ac @@ -284,7 +284,7 @@ if test "x$debug" = "xyes" ; then # Check for -fstack-protector availability GCC_STACK_PROTECT_LIB GCC_STACK_PROTECT_CC - CFLAGS="$CFLAGS -Wall -Werror" + CFLAGS="$CFLAGS -g -Wall -Werror" else AC_MSG_RESULT(no) CFLAGS="$CFLAGS -Wall" diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 79ecf85c..f8fb09fe 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -130,8 +130,8 @@ static int download_internal(const char *url, const char *localpath, /* libfetch does not reset the error code */ fetchLastErrCode = 0; - /* 10s timeout - TODO make a config option */ - fetchTimeout = 10000; + /* 10s timeout */ + fetchTimeout = 10; /* ignore any SIGPIPE signals- these may occur if our FTP socket dies or * something along those lines. Store the old signal handler first. */ diff --git a/src/pacman/query.c b/src/pacman/query.c index 32752ffb..a9717074 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -172,7 +172,7 @@ static int query_search(alpm_list_t *targets) } /* print the package size with the output if ShowSize option set */ - if(config->showsize) { + if(!config->quiet && config->showsize) { /* Convert byte size to MB */ double mbsize = (double)alpm_pkg_get_size(pkg) / (1024.0 * 1024.0); @@ -394,6 +394,7 @@ static int display(pmpkg_t *pkg) int pacman_query(alpm_list_t *targets) { int ret = 0; + int match = 0; alpm_list_t *i; pmpkg_t *pkg = NULL; @@ -436,8 +437,12 @@ int pacman_query(alpm_list_t *targets) if(value != 0) { ret = 1; } + match = 1; } } + if(!match) { + ret = 1; + } return(ret); } @@ -471,6 +476,7 @@ int pacman_query(alpm_list_t *targets) if(value != 0) { ret = 1; } + match = 1; } if(config->op_q_isfile) { @@ -479,6 +485,10 @@ int pacman_query(alpm_list_t *targets) } } + if(!match) { + ret = 1; + } + return(ret); } diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 7bfe454b..dc936219 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -308,7 +308,7 @@ static int sync_search(alpm_list_t *syncs, alpm_list_t *targets) } /* print the package size with the output if ShowSize option set */ - if(config->showsize) { + if(!config->quiet && config->showsize) { /* Convert byte size to MB */ double mbsize = alpm_pkg_get_size(pkg) / (1024.0 * 1024.0); diff --git a/src/util/testdb.c b/src/util/testdb.c index abbc62f1..e521e6b3 100644 --- a/src/util/testdb.c +++ b/src/util/testdb.c @@ -183,9 +183,9 @@ int check_syncdbs(char *dbpath, alpm_list_t *dbnames) { void usage() { fprintf(stderr, "usage:\n"); - fprintf(stderr, + fprintf(stderr, "\t%s [-b <pacman db>] : check the local database\n", BASENAME); - fprintf(stderr, + fprintf(stderr, "\t%s [-b <pacman db>] core extra ... : check the listed sync databases\n", BASENAME); exit(1); } @@ -224,10 +224,8 @@ int main(int argc, char **argv) alpm_option_set_dbpath(dbpath); if(!dbnames) { - printf("Checking the integrity of the local database in %s\n",dbpath); ret = check_localdb(dbpath); } else { - printf("Checking the integrity of the sync databases in %s\n",dbpath); ret = check_syncdbs(dbpath,dbnames); } |