moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-23 00:08:50 -05:00
Code Issues Releases Wiki Activity

Restore --debug/--verbose output without a primary operation

Browse Source 
This is by no means a guarantee of this behavior remaining the same in
the future, but it is easy enough to do what we used to in this case by
delaying any sort of error condition until after we are completely done
parsing options. Addresses FS#23370.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-03-21 00:24:36 -05:00
parent d3b32a68fe
commit fd3acff5e6
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/pacman/pacman.c
View File

@ -740,7 +740,8 @@ static int parseargs(int argc, char *argv[])
} else if(opt == '?') {
/* this should have failed during first pass already */
return(1);
} else if(parsearg_op(opt, 1) == 0) { /* opt is an operation */
} else if(parsearg_op(opt, 1) == 0) {
/* opt is an operation */
continue;
}
@ -757,18 +758,17 @@ static int parseargs(int argc, char *argv[])
case PM_OP_SYNC:
result = parsearg_sync(opt);
break;
case PM_OP_DEPTEST:
result = 1;
break;
case PM_OP_UPGRADE:
result = parsearg_upgrade(opt);
break;
case PM_OP_DEPTEST:
default:
pm_printf(PM_LOG_ERROR, _("no operation specified (use -h for help)\n"));
return(1);
result = 1;
break;
}
if (result == 0)
if (result == 0) {
continue;
}
/* fall back to global options */
result = parsearg_global(opt);