diff options
| author | Aurelien Foret <aurelien@archlinux.org> | 2005-04-06 22:59:13 +0200 |
|---|---|---|
| committer | Aurelien Foret <aurelien@archlinux.org> | 2005-04-06 22:59:13 +0200 |
| commit | 48f8f521b16646166c1bc7183ad60b227fc2eea1 (patch) | |
| tree | 252387b16ac2ea21edfc23bca1992636fbe70ed6 | |
| parent | 4091aa11658257bc73a1cd07efe812193eb36a84 (diff) | |
| download | pacman-48f8f521b16646166c1bc7183ad60b227fc2eea1.tar.gz pacman-48f8f521b16646166c1bc7183ad60b227fc2eea1.tar.xz | |
reworked MSG and ERR outputs
| -rw-r--r-- | src/pacman/add.c | 2 | ||||
| -rw-r--r-- | src/pacman/pacman.c | 14 |
2 files changed, 10 insertions, 6 deletions
diff --git a/src/pacman/add.c b/src/pacman/add.c index 0cff3937..7e45550f 100644 --- a/src/pacman/add.c +++ b/src/pacman/add.c @@ -110,7 +110,7 @@ int pacman_add(list_t *targets) MSG(NL, ":: %s\n", (char *)alpm_list_getdata(i)); } alpm_list_free(data); - MSG(NL, "\nerrors occurred, no packages were upgraded.\n\n"); + MSG(NL, "\nerrors occurred, no packages were upgraded.\n"); break; default: break; diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 7f13f39e..140500a5 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -183,9 +183,12 @@ int main(int argc, char *argv[]) case PM_OP_DEPTEST: ret = pacman_deptest(pm_targets); break; case PM_OP_MAIN: ret = 0; break; default: - ERR(NL, "no operation specified (use -h for help)\n\n"); + ERR(NL, "no operation specified (use -h for help)\n"); ret = 1; } + if(ret != 0) { + MSG(NL, "\n"); + } cleanup(ret); /* not reached */ @@ -196,7 +199,7 @@ void cleanup(int signum) { list_t *lp; - /* free pm library resources */ + /* free alpm library resources */ if(alpm_release() == -1) { ERR(NL, "%s\n", alpm_strerror(pm_errno)); } @@ -439,7 +442,7 @@ int parseargs(int argc, char **argv) } if(pmo_op == 0) { - ERR(NL, "only one operation may be used at a time\n\n"); + ERR(NL, "only one operation may be used at a time\n"); return(1); } @@ -477,7 +480,7 @@ void usage(int op, char *myname) printf(" %s {-F --freshen} [options] <file>\n", myname); printf(" %s {-Q --query} [options] [package]\n", myname); printf(" %s {-S --sync} [options] [package]\n", myname); - printf("\nuse '%s --help' with other options for more syntax\n\n", myname); + printf("\nuse '%s --help' with other options for more syntax\n", myname); } else { if(op == PM_OP_ADD) { printf("usage: %s {-A --add} [options] <file>\n", myname); @@ -543,7 +546,8 @@ void version() printf("/ _.-' .-. .-. .-. Copyright (C) 2002-2005 Judd Vinet <jvinet@zeroflux.org>\n"); printf("\\ '-. '-' '-' '-' \n"); printf(" '--' This program may be freely redistributed under\n"); - printf(" the terms of the GNU General Public License\n\n"); + printf(" the terms of the GNU General Public License\n"); + printf("\n"); } /* |