aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew McGill <mhollismcgill@gmail.com>2020-01-04 15:10:07 -0500
committerTimo Teräs <timo.teras@iki.fi>2020-01-05 23:28:43 +0200
commite4aae45f960691afdc25ebc9d0b4c38af40e4346 (patch)
tree2415036789455c218efa470cb6d02e826c700215
parent7d930f942cf9989e53381a05bce7de99b2d2aa9c (diff)
downloadapk-tools-e4aae45f960691afdc25ebc9d0b4c38af40e4346.tar.bz2
apk-tools-e4aae45f960691afdc25ebc9d0b4c38af40e4346.tar.xz
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.
-rw-r--r--src/info.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/info.c b/src/info.c
index 836e61f..e9a2b06 100644
--- a/src/info.c
+++ b/src/info.c
@@ -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" },