bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'maint'

Browse source 
Conflicts:
	lib/libalpm/dload.c
This commit is contained in:
Dan McGee 2009-08-18 20:49:25 -05:00
commit 92f0775e76
5 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -284,7 +284,7 @@ if test "x$debug" = "xyes" ; then
# Check for -fstack-protector availability # Check for -fstack-protector availability
GCC_STACK_PROTECT_LIB GCC_STACK_PROTECT_LIB
GCC_STACK_PROTECT_CC GCC_STACK_PROTECT_CC
CFLAGS="$CFLAGS -Wall -Werror" CFLAGS="$CFLAGS -g -Wall -Werror"
else else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
CFLAGS="$CFLAGS -Wall" CFLAGS="$CFLAGS -Wall"

4
lib/libalpm/dload.c
View file

@ -130,8 +130,8 @@ static int download_internal(const char *url, const char *localpath,
/* libfetch does not reset the error code */ /* libfetch does not reset the error code */
fetchLastErrCode = 0; fetchLastErrCode = 0;
/* 10s timeout - TODO make a config option */ /* 10s timeout */
fetchTimeout = 10000; fetchTimeout = 10;
/* ignore any SIGPIPE signals- these may occur if our FTP socket dies or /* ignore any SIGPIPE signals- these may occur if our FTP socket dies or
* something along those lines. Store the old signal handler first. */ * something along those lines. Store the old signal handler first. */

12
src/pacman/query.c
View file

@ -172,7 +172,7 @@ static int query_search(alpm_list_t *targets)
} }
/* print the package size with the output if ShowSize option set */ /* print the package size with the output if ShowSize option set */
if(config->showsize) { if(!config->quiet && config->showsize) {
/* Convert byte size to MB */ /* Convert byte size to MB */
double mbsize = (double)alpm_pkg_get_size(pkg) / (1024.0 * 1024.0); 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 pacman_query(alpm_list_t *targets)
{ {
int ret = 0; int ret = 0;
int match = 0;
alpm_list_t *i; alpm_list_t *i;
pmpkg_t *pkg = NULL; pmpkg_t *pkg = NULL;
@ -436,8 +437,12 @@ int pacman_query(alpm_list_t *targets)
if(value != 0) { if(value != 0) {
ret = 1; ret = 1;
} }
match = 1;
} }
} }
if(!match) {
ret = 1;
}
return(ret); return(ret);
} }
@ -471,6 +476,7 @@ int pacman_query(alpm_list_t *targets)
if(value != 0) { if(value != 0) {
ret = 1; ret = 1;
} }
match = 1;
} }
if(config->op_q_isfile) { if(config->op_q_isfile) {
@ -479,6 +485,10 @@ int pacman_query(alpm_list_t *targets)
} }
} }
if(!match) {
ret = 1;
}
return(ret); return(ret);
} }

2
src/pacman/sync.c
View file

@ -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 */ /* print the package size with the output if ShowSize option set */
if(config->showsize) { if(!config->quiet && config->showsize) {
/* Convert byte size to MB */ /* Convert byte size to MB */
double mbsize = alpm_pkg_get_size(pkg) / (1024.0 * 1024.0); double mbsize = alpm_pkg_get_size(pkg) / (1024.0 * 1024.0);

2
src/util/testdb.c
View file

@ -224,10 +224,8 @@ int main(int argc, char **argv)
alpm_option_set_dbpath(dbpath); alpm_option_set_dbpath(dbpath);
if(!dbnames) { if(!dbnames) {
printf("Checking the integrity of the local database in %s\n",dbpath);
ret = check_localdb(dbpath); ret = check_localdb(dbpath);
} else { } else {
printf("Checking the integrity of the sync databases in %s\n",dbpath);
ret = check_syncdbs(dbpath,dbnames); ret = check_syncdbs(dbpath,dbnames);
} }