From f1928b9d26cfc415911a2e4346fbfefb909745ac Mon Sep 17 00:00:00 2001 From: Jeff Blaine Date: Wed, 18 May 2011 21:46:52 -0400 Subject: [PATCH] Hide -noexecute in favor of -dryrun Makes all previous -noexecute arguments hidden (still callable) and replaces them with -dryrun whose help text has been made common where appropriate instead of the 3 previous ways the argument was explained. Change-Id: I0ef3daa88dc771d972131358dc6e8a23ecd5a33b Reviewed-on: http://gerrit.openafs.org/4678 Tested-by: BuildBot Reviewed-by: Jeffrey Altman --- src/bucoord/commands.c | 7 ++++++- src/bucoord/main.c | 5 +++-- src/uss/uss.c | 10 +++++----- src/volser/vos.c | 17 ++++++++++------- 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/src/bucoord/commands.c b/src/bucoord/commands.c index 244f4a7..4521700 100644 --- a/src/bucoord/commands.c +++ b/src/bucoord/commands.c @@ -2467,7 +2467,12 @@ bc_deleteDumpCmd(struct cmd_syndesc *as, void *arock) if (havegroupid) groupId = atoi(as->parms[4].items->data); - noexecute = (as->parms[7].items ? 1 : 0); + if (as->parms[7].items || as->parms[8].items) { + /* -noexecute (hidden) or -dryrun used */ + noexecute = 1; + } else { + noexecute = 0; + } /* Get the time to delete to */ if (as->parms[2].items) { /* -to */ diff --git a/src/bucoord/main.c b/src/bucoord/main.c index ad0801c..206518b 100644 --- a/src/bucoord/main.c +++ b/src/bucoord/main.c @@ -701,8 +701,9 @@ main(int argc, char **argv) "delete the dump from the backup database only"); cmd_AddParm(ts, "-force", CMD_FLAG, CMD_OPTIONAL, "always delete from backup database"); - cmd_AddParm(ts, "-noexecute", CMD_FLAG, CMD_OPTIONAL, - "Just list the dumps"); + cmd_AddParm(ts, "-noexecute", CMD_FLAG, CMD_OPTIONAL|CMD_HIDDEN, ""); + cmd_AddParm(ts, "-dryrun", CMD_FLAG, CMD_OPTIONAL, + "list the dumps, don't delete anything"); if (!interact) add_std_args(ts); diff --git a/src/uss/uss.c b/src/uss/uss.c index b1463a8..f15f6c6 100644 --- a/src/uss/uss.c +++ b/src/uss/uss.c @@ -1841,7 +1841,7 @@ main(int argc, char *argv[]) cmd_AddParm(cs, "-admin", CMD_SINGLE, CMD_OPTIONAL, "administrator to authenticate"); cmd_AddParm(cs, "-dryrun", CMD_FLAG, CMD_OPTIONAL, - "only list what would be done, don't do it"); + "list what would be done, don't do it"); cmd_AddParm(cs, "-skipauth", CMD_FLAG, CMD_OPTIONAL, "ignore all contact with the authentication server (kaserver)"); cmd_AddParm(cs, "-overwrite", CMD_FLAG, CMD_OPTIONAL, @@ -1861,7 +1861,7 @@ main(int argc, char *argv[]) cmd_AddParm(cs, "-admin", CMD_SINGLE, CMD_OPTIONAL, "administrator to authenticate"); cmd_AddParm(cs, "-dryrun", CMD_FLAG, CMD_OPTIONAL, - "only list what would be done, don't do it"); + "list what would be done, don't do it"); cmd_AddParm(cs, "-skipauth", CMD_FLAG, CMD_OPTIONAL, "ignore all contact with the authentication server (kaserver)"); cmd_AddParm(cs, "-overwrite", CMD_FLAG, CMD_OPTIONAL, @@ -1902,7 +1902,7 @@ main(int argc, char *argv[]) cmd_AddParm(cs, "-admin", CMD_SINGLE, CMD_OPTIONAL, "administrator to authenticate"); cmd_AddParm(cs, "-dryrun", CMD_FLAG, CMD_OPTIONAL, - "only list what would be done, don't do it"); + "list what would be done, don't do it"); cmd_AddParm(cs, "-skipauth", CMD_FLAG, CMD_OPTIONAL, "ignore all contact with the authentication server (kaserver)"); #if USS_FUTURE_FEATURES @@ -1922,7 +1922,7 @@ main(int argc, char *argv[]) cmd_AddParm(cs, "-admin", CMD_SINGLE, CMD_OPTIONAL, "administrator to authenticate"); cmd_AddParm(cs, "-dryrun", CMD_FLAG, CMD_OPTIONAL, - "only list what would be done, don't do it"); + "list what would be done, don't do it"); cmd_AddParm(cs, "-skipauth", CMD_FLAG, CMD_OPTIONAL, "ignore all contact with the authentication server (kaserver)"); #endif /* USS_DONT_HIDE_SOME_FEATURES */ @@ -1955,7 +1955,7 @@ main(int argc, char *argv[]) cmd_AddParm(cs, "-admin", CMD_SINGLE, CMD_OPTIONAL, "administrator to authenticate"); cmd_AddParm(cs, "-dryrun", CMD_FLAG, CMD_OPTIONAL, - "only list what would be done, don't do it"); + "list what would be done, don't do it"); cmd_AddParm(cs, "-skipauth", CMD_FLAG, CMD_OPTIONAL, "ignore all contact with the authentication server (kaserver)"); #endif /* USS_DONT_HIDE_SOME_FEATURES */ diff --git a/src/volser/vos.c b/src/volser/vos.c index b9cbc82..bb4a7b9 100644 --- a/src/volser/vos.c +++ b/src/volser/vos.c @@ -4274,7 +4274,8 @@ DeleteEntry(struct cmd_syndesc *as, void *arock) itp->data); continue; } - if (as->parms[4].items) { /* -noexecute */ + if (as->parms[4].items || as->parms[5].items) { + /* -noexecute (hidden) or -dryrun */ fprintf(STDOUT, "Would have deleted VLDB entry for %s \n", itp->data); fflush(STDOUT); @@ -4384,7 +4385,8 @@ DeleteEntry(struct cmd_syndesc *as, void *arock) } } - if (as->parms[4].items) { /* -noexecute */ + if (as->parms[4].items || as->parms[5].items) { + /* -noexecute (hidden) or -dryrun */ fprintf(STDOUT, "Would have deleted VLDB entry for %s \n", vllist->name); fflush(STDOUT); @@ -6122,14 +6124,14 @@ main(int argc, char **argv) cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "machine name"); cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, "partition name"); cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_OPTIONAL, "volume name or ID"); - cmd_AddParm(ts, "-dryrun", CMD_FLAG, CMD_OPTIONAL, "report without updating"); + cmd_AddParm(ts, "-dryrun", CMD_FLAG, CMD_OPTIONAL, "list what would be done, don't do it"); COMMONPARMS; ts = cmd_CreateSyntax("syncserv", SyncServer, NULL, "synchronize server with VLDB"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, "partition name"); - cmd_AddParm(ts, "-dryrun", CMD_FLAG, CMD_OPTIONAL, "report without updating"); + cmd_AddParm(ts, "-dryrun", CMD_FLAG, CMD_OPTIONAL, "list what would be done, don't do it"); COMMONPARMS; ts = cmd_CreateSyntax("examine", ExamineVolume, NULL, @@ -6206,7 +6208,7 @@ main(int argc, char **argv) "exclude common prefix volumes"); cmd_AddParm(ts, "-xprefix", CMD_LIST, CMD_OPTIONAL, "negative prefix on volume(s)"); - cmd_AddParm(ts, "-dryrun", CMD_FLAG, CMD_OPTIONAL, "no action"); + cmd_AddParm(ts, "-dryrun", CMD_FLAG, CMD_OPTIONAL, "list what would be done, don't do it"); COMMONPARMS; ts = cmd_CreateSyntax("delentry", DeleteEntry, NULL, @@ -6216,8 +6218,9 @@ main(int argc, char **argv) "prefix of the volume whose VLDB entry is to be deleted"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "machine name"); cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, "partition name"); - cmd_AddParm(ts, "-noexecute", CMD_FLAG, CMD_OPTIONAL, - "no execute"); + cmd_AddParm(ts, "-noexecute", CMD_FLAG, CMD_OPTIONAL|CMD_HIDDEN, ""); + cmd_AddParm(ts, "-dryrun", CMD_FLAG, CMD_OPTIONAL, + "list what would be done, don't do it"); COMMONPARMS; ts = cmd_CreateSyntax("partinfo", PartitionInfo, NULL, -- 1.9.4