info: Remove short options for --install-if, --rinstall-if

The "apk info" option --install-if, which had the short option -i,
was being shadowed by the apk global option --interactive, which
has the same short option. To fix this issue the short option for
--install-if was removed, as has been done in other cases where an
applet short option would be shadowed by a global short option. The
short option for --rinstall-if was also removed for consistency,
since it is the complement of --install-if.
cute-signatures
Matthew McGill 2020-01-04 15:10:07 -05:00 committed by Timo Teräs
parent 7d930f942c
commit e4aae45f96
1 changed files with 4 additions and 4 deletions

View File

@ -392,10 +392,10 @@ static int option_parse_applet(void *pctx, struct apk_db_options *dbopts, int op
case 'r':
ctx->subaction_mask |= APK_INFO_RDEPENDS;
break;
case 'I':
case 0x10002:
ctx->subaction_mask |= APK_INFO_INSTALL_IF;
break;
case 'i':
case 0x10003:
ctx->subaction_mask |= APK_INFO_RINSTALL_IF;
break;
case 's':
@ -457,8 +457,8 @@ static const struct apk_option options_applet[] = {
{ 'P', "provides", "List virtual packages provided by PACKAGE" },
{ 'r', "rdepends", "List all packages depending on PACKAGE" },
{ 0x10000, "replaces", "List packages whom files PACKAGE might replace" },
{ 'i', "install-if", "List the PACKAGE's install_if rule" },
{ 'I', "rinstall-if", "List all packages having install_if referencing PACKAGE" },
{ 0x10002, "install-if", "List the PACKAGE's install_if rule" },
{ 0x10003, "rinstall-if", "List all packages having install_if referencing PACKAGE" },
{ 'w', "webpage", "Show URL for more information about PACKAGE" },
{ 's', "size", "Show installed size of PACKAGE" },
{ 'd', "description", "Print description for PACKAGE" },