From 4470e5ce011fef0c918b5c3d1d42ae333fb361ba Mon Sep 17 00:00:00 2001 From: Aaron Griffin Date: Tue, 14 Nov 2006 07:58:42 +0000 Subject: * Numerous mini valgrind fixes. * Addition of hacky architecture check in the _splitname function * Removal of libfetch from the archlinux proper - it has been renamed to libdownload and can be found at http://phraktured.net/libdownload * Merge of _some_ of the Frugalware makepkg change - this may still be incomplete * Removal of libftp from cvs proper * PKGBUILD manpage now says 'PKGBUILD' instead of FrugalBuild (he he) --- src/pacman/pacman.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/pacman/pacman.c') diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index c5be07d6..79c15c3f 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -46,7 +46,7 @@ #include "list.h" #include "util.h" #include "log.h" -#include "download.h" +#include "downloadprog.h" #include "conf.h" #include "package.h" #include "add.h" @@ -187,8 +187,8 @@ static void cleanup(int signum) fprintf(stderr, "Internal pacman error: Segmentation fault\n" "Please submit a full bug report, with the given package if appropriate.\n"); exit(signum); - } else if((signum == SIGINT) && (alpm_trans_release() == -1) && (pm_errno == - PM_ERR_TRANS_COMMITING)) { + } else if((signum == SIGINT) && (alpm_trans_release() == -1) + && (pm_errno == PM_ERR_TRANS_COMMITING)) { return; } if(signum != 0 && config->op_d_vertest == 0) { @@ -411,7 +411,7 @@ int main(int argc, char *argv[]) list_t *lp; #if defined(PACMAN_DEBUG) && !defined(CYGWIN) && !defined(BSD) - setenv("MALLOC_TRACE","pacman.mtrace", 0); + /*setenv("MALLOC_TRACE","pacman.mtrace", 0);*/ mtrace(); #endif cenv = getenv("COLUMNS"); -- cgit v1.2.3-24-g4f1b