diff options
| author | Aaron Griffin <aaron@archlinux.org> | 2007-02-09 17:02:01 +0100 |
|---|---|---|
| committer | Aaron Griffin <aaron@archlinux.org> | 2007-02-09 17:02:01 +0100 |
| commit | d8fd645c4c5aff5042da158d2471a2f72c443aad (patch) | |
| tree | 6f8a76f1afcc3e4c8ce7ee0ca3ceb739b00fd361 /src/pacman/pacman.c | |
| parent | 4e0b649c3af6deeb6fcf765deaa3dc9b2f68452d (diff) | |
| download | pacman-d8fd645c4c5aff5042da158d2471a2f72c443aad.tar.gz pacman-d8fd645c4c5aff5042da158d2471a2f72c443aad.tar.xz | |
* Cleaned up direct pm_fprintf usage (move to MSG/ERR macros for now)
* Moved some stderr output to stdout
* Remove "RETRIEVE_LOCAL" trans event as libdownload handles local files
Diffstat (limited to 'src/pacman/pacman.c')
| -rw-r--r-- | src/pacman/pacman.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 48c986a2..99248346 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -184,6 +184,7 @@ static void cleanup(int signum) return; } if(signum != 0 && config->op_d_vertest == 0) { + /* TODO why is this here? */ fprintf(stderr, "\n"); } @@ -295,7 +296,7 @@ static int parseargs(int argc, char *argv[]) case 2: logmask |= PM_LOG_DOWNLOAD; /*fall through */ case 1: logmask |= PM_LOG_DEBUG; break; default: - pm_fprintf(stderr, NL, _("error: '%s' is not a valid debug level"), optarg); + ERR(NL, _("error: '%s' is not a valid debug level"), optarg); return(1); } printf("logmask = %d\n", logmask); @@ -331,7 +332,7 @@ static int parseargs(int argc, char *argv[]) break; case 'b': if(stat(optarg, &st) == -1 || !S_ISDIR(st.st_mode)) { - pm_fprintf(stderr, NL, _("error: '%s' is not a valid db path\n"), optarg); + ERR(NL, _("error: '%s' is not a valid db path\n"), optarg); return(1); } alpm_option_set_dbpath(optarg); @@ -361,7 +362,7 @@ static int parseargs(int argc, char *argv[]) break; case 'r': if(realpath(optarg, root) == NULL) { - pm_fprintf(stderr, NL, _("error: '%s' is not a valid root path\n"), optarg); + ERR(NL, _("error: '%s' is not a valid root path\n"), optarg); return(1); } alpm_option_set_root(strdup(root)); |