shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-08-03 08:22:00 +03:00
Code Releases Activity

display: ignore --reportformat

Browse Source 
Using the option would do nothing useful but would
print extraneous braces.
This commit is contained in:
David Teigland
2021-11-17 10:40:27 -06:00
parent e4b8726b6d
commit b8f4ec846d
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/command-lines.in
View File

@ -1359,10 +1359,10 @@ OO: --aligned, --all, --binary, --colon, --columns,
--configreport ConfigReport, --foreign, --history, --ignorelockingfailure, --configreport ConfigReport, --foreign, --history, --ignorelockingfailure,
--logonly, --maps, --noheadings, --logonly, --maps, --noheadings,
--nosuffix, --options String, --sort String, --readonly, --nosuffix, --options String, --sort String, --readonly,
--reportformat ReportFmt, --segments, --select String, --separator String, --segments, --select String, --separator String,
--shared, --unbuffered, --units Units --shared, --unbuffered, --units Units
OP: VG|LV|Tag ... OP: VG|LV|Tag ...
IO: --partial, --ignoreskippedcluster IO: --partial, --ignoreskippedcluster, --reportformat ReportFmt
ID: lvdisplay_general ID: lvdisplay_general
--- ---
@ -1590,10 +1590,10 @@ pvdisplay
OO: --aligned, --all, --binary, --colon, --columns, --configreport ConfigReport, OO: --aligned, --all, --binary, --colon, --columns, --configreport ConfigReport,
--foreign, --ignorelockingfailure, --foreign, --ignorelockingfailure,
--logonly, --maps, --noheadings, --nosuffix, --options String, --logonly, --maps, --noheadings, --nosuffix, --options String,
--readonly, --reportformat ReportFmt, --select String, --separator String, --shared, --readonly, --select String, --separator String, --shared,
--short, --sort String, --unbuffered, --units Units --short, --sort String, --unbuffered, --units Units
OP: PV|Tag ... OP: PV|Tag ...
IO: --ignoreskippedcluster IO: --ignoreskippedcluster, --reportformat ReportFmt
ID: pvdisplay_general ID: pvdisplay_general
--- ---
@ -1811,10 +1811,10 @@ vgdisplay
OO: --activevolumegroups, --aligned, --binary, --colon, --columns, OO: --activevolumegroups, --aligned, --binary, --colon, --columns,
--configreport ConfigReport, --foreign, --ignorelockingfailure, --configreport ConfigReport, --foreign, --ignorelockingfailure,
--logonly, --noheadings, --nosuffix, --logonly, --noheadings, --nosuffix,
--options String, --readonly, --reportformat ReportFmt, --select String, --options String, --readonly, --select String,
--shared, --short, --separator String, --sort String, --unbuffered, --units Units --shared, --short, --separator String, --sort String, --unbuffered, --units Units
OP: VG|Tag ... OP: VG|Tag ...
IO: --partial, --ignoreskippedcluster IO: --partial, --ignoreskippedcluster, --reportformat ReportFmt
ID: vgdisplay_general ID: vgdisplay_general
--- ---

15
tools/lvmcmdline.c
View File

@ -3060,6 +3060,7 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv)
int i; int i;
int skip_hyphens; int skip_hyphens;
int refresh_done = 0; int refresh_done = 0;
int io;
/* Avoid excessive access to /etc/localtime and set TZ variable for glibc /* Avoid excessive access to /etc/localtime and set TZ variable for glibc
* so it does not need to check /etc/localtime everytime that needs that info */ * so it does not need to check /etc/localtime everytime that needs that info */
@ -3142,6 +3143,20 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv)
if (!(cmd->command = _find_command(cmd, cmd->name, &argc, argv))) if (!(cmd->command = _find_command(cmd, cmd->name, &argc, argv)))
return EINVALID_CMD_LINE; return EINVALID_CMD_LINE;
/*
* If option --foo is set which is listed in IO (ignore option) in
* command-lines.in, then unset foo. Commands won't usually use an
* ignored option, but there can be shared code that checks for --foo,
* and should not find it to be set.
*/
for (io = 0; io < cmd->command->io_count; io++) {
int opt = cmd->command->ignore_opt_args[io].opt;
if (arg_is_set(cmd, opt)) {
log_debug("Ignore opt %d", opt);
cmd->opt_arg_values[opt].count = 0;
}
}
/* /*
* Remaining position args after command name and --options are removed. * Remaining position args after command name and --options are removed.
*/ */