moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

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>
This commit is contained in:
Andrew Gregory 2013-10-12 13:32:06 -04:00 committed by Allan McRae
parent 2c11e5da1d
commit 807f014d77
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/pacman/conf.h
View File

@ -128,7 +128,8 @@ enum {
/* Long Operations */
enum {
OP_NOCONFIRM = 1000,
OP_LONG_FLAG_MIN = 1000,
OP_NOCONFIRM,
OP_CONFIG,
OP_IGNORE,
OP_DEBUG,

7
src/pacman/pacman.c
View File

@ -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;
}
}