jaiden
/
apk-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "move --simulate to global options" 

This reverts commit 358f703b76.

The short option -s conflicts info --size and fetch --stdout.
Revert this for now.
cute-signatures
Timo Teräs 2018-11-15 12:03:51 +02:00
parent 0565e9bb05
commit bd8967bcb7
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/apk.c
View File

@ -123,7 +123,7 @@ static int option_parse_global(void *ctx, struct apk_db_options *dbopts, int opt
case 0x101: case 0x101:
apk_flags |= APK_PROGRESS; apk_flags |= APK_PROGRESS;
break; break;
case 's': case 0x104:
apk_flags |= APK_SIMULATE; apk_flags |= APK_SIMULATE;
break; break;
case 0x110: case 0x110:
@ -192,7 +192,6 @@ static const struct apk_option options_global[] = {
{ 'i', "interactive", "Ask confirmation for certain operations" }, { 'i', "interactive", "Ask confirmation for certain operations" },
{ 'V', "version", "Print program version and exit" }, { 'V', "version", "Print program version and exit" },
{ 'f', "force", "Enable selected --force-* (deprecated)" }, { '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" }, { 0x125, "force-binary-stdout", "Continue even if binary data is to be output" },
{ 0x122, "force-broken-world", "Continue even if 'world' cannot be satisfied" }, { 0x122, "force-broken-world", "Continue even if 'world' cannot be satisfied" },
{ 0x124, "force-non-repository", "Continue even if packages may be lost on reboot" }, { 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) static int option_parse_commit(void *ctx, struct apk_db_options *dbopts, int optch, const char *optarg)
{ {
switch (optch) { switch (optch) {
case 's':
apk_flags |= APK_SIMULATE;
break;
case 0x102: case 0x102:
apk_flags |= APK_CLEAN_PROTECTED; apk_flags |= APK_CLEAN_PROTECTED;
break; 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[] = { 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" }, { 0x102, "clean-protected", "Do not create .apk-new files in configuration dirs" },
{ 0x111, "overlay-from-stdin", "Read list of overlay files from stdin" }, { 0x111, "overlay-from-stdin", "Read list of overlay files from stdin" },
{ 0x113, "no-scripts", "Do not execute any scripts" }, { 0x113, "no-scripts", "Do not execute any scripts" },