summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2018-11-15 12:03:51 +0200
committerTimo Teräs <timo.teras@iki.fi>2018-11-15 12:03:51 +0200
commitbd8967bcb73bc3bc5c520784aafcfeb17dccae82 (patch)
tree298c53539824f25f9c7284d47fc3e204836047a1
parent0565e9bb050ab979f6b8bf7920c5820d8abaf702 (diff)
downloadapk-tools-bd8967bcb73bc3bc5c520784aafcfeb17dccae82.tar.bz2
apk-tools-bd8967bcb73bc3bc5c520784aafcfeb17dccae82.tar.xz
Revert "move --simulate to global options"
This reverts commit 358f703b76ece639e5d3634f677e0b345b1b9f89. The short option -s conflicts info --size and fetch --stdout. Revert this for now.
-rw-r--r--src/apk.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/apk.c b/src/apk.c
index ef1dcd8..2819281 100644
--- a/src/apk.c
+++ b/src/apk.c
@@ -123,7 +123,7 @@ static int option_parse_global(void *ctx, struct apk_db_options *dbopts, int opt
case 0x101:
apk_flags |= APK_PROGRESS;
break;
- case 's':
+ case 0x104:
apk_flags |= APK_SIMULATE;
break;
case 0x110:
@@ -192,7 +192,6 @@ static const struct apk_option options_global[] = {
{ 'i', "interactive", "Ask confirmation for certain operations" },
{ 'V', "version", "Print program version and exit" },
{ 'f', "force", "Enable selected --force-* (deprecated)" },
- { 's', "simulate", "Show what would be done without actually doing it" },
{ 0x125, "force-binary-stdout", "Continue even if binary data is to be output" },
{ 0x122, "force-broken-world", "Continue even if 'world' cannot be satisfied" },
{ 0x124, "force-non-repository", "Continue even if packages may be lost on reboot" },
@@ -239,6 +238,9 @@ const struct apk_option_group optgroup_global = {
static int option_parse_commit(void *ctx, struct apk_db_options *dbopts, int optch, const char *optarg)
{
switch (optch) {
+ case 's':
+ apk_flags |= APK_SIMULATE;
+ break;
case 0x102:
apk_flags |= APK_CLEAN_PROTECTED;
break;
@@ -264,6 +266,7 @@ static int option_parse_commit(void *ctx, struct apk_db_options *dbopts, int opt
}
static const struct apk_option options_commit[] = {
+ { 's', "simulate", "Show what would be done without actually doing it" },
{ 0x102, "clean-protected", "Do not create .apk-new files in configuration dirs" },
{ 0x111, "overlay-from-stdin", "Read list of overlay files from stdin" },
{ 0x113, "no-scripts", "Do not execute any scripts" },