Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Gregory <andrew.gregory.8@gmail.com>2013-10-12 13:32:06 -0400
committerAllan McRae <allan@archlinux.org>2013-10-14 13:01:15 +1000
commit807f014d777fbcc7b43fa5159a8b0d12a44d63ae (patch)
tree0f53b5967b9e7eea7c02bdd3c8b55eea249fa0e6
parent2c11e5da1d7c6ac86ff23abfaff019793baed3a6 (diff)
include invalid options in error messages
On invalid combinations of flags we were only printing the unhelpfully vague message "invalid option". Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--src/pacman/conf.h3
-rw-r--r--src/pacman/pacman.c7
2 files changed, 8 insertions, 2 deletions
diff --git a/src/pacman/conf.h b/src/pacman/conf.h
index 3ba49eae..c2ed1cac 100644
--- a/src/pacman/conf.h
+++ b/src/pacman/conf.h
@@ -128,7 +128,8 @@ enum {
/* Long Operations */
enum {
- OP_NOCONFIRM = 1000,
+ OP_LONG_FLAG_MIN = 1000,
+ OP_NOCONFIRM,
OP_CONFIG,
OP_IGNORE,
OP_DEBUG,
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index 0ba357bb..f4856924 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -947,7 +947,12 @@ static int parseargs(int argc, char *argv[])
result = parsearg_global(opt);
if(result != 0) {
/* global option parsing failed, abort */
- pm_printf(ALPM_LOG_ERROR, _("invalid option\n"));
+ if(opt < OP_LONG_FLAG_MIN) {
+ pm_printf(ALPM_LOG_ERROR, _("invalid option '-%c'\n"), opt);
+ } else {
+ pm_printf(ALPM_LOG_ERROR, _("invalid option '--%s'\n"),
+ opts[option_index].name);
+ }
return result;
}
}