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 */
"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);
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,
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,
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
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 */
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 */
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);
}
}
- 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);
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,
"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,
"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,