diff options
| author | Aaron Griffin <aaron@archlinux.org> | 2006-11-14 08:58:42 +0100 |
|---|---|---|
| committer | Aaron Griffin <aaron@archlinux.org> | 2006-11-14 08:58:42 +0100 |
| commit | 4470e5ce011fef0c918b5c3d1d42ae333fb361ba (patch) | |
| tree | 5ce8d77cc28f688d53fdea517434f6b1f4f10f10 /src/pacman/pacman.c | |
| parent | 7e835366f15f98a1688e022a781483d5c5eeb114 (diff) | |
| download | pacman-4470e5ce011fef0c918b5c3d1d42ae333fb361ba.tar.gz pacman-4470e5ce011fef0c918b5c3d1d42ae333fb361ba.tar.xz | |
* 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)
Diffstat (limited to 'src/pacman/pacman.c')
| -rw-r--r-- | src/pacman/pacman.c | 8 |
1 files changed, 4 insertions, 4 deletions
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"); |