display: ignore --reportformat

Using the option would do nothing useful but would
print extraneous braces.

diff --git a/tools/command-lines.in b/tools/command-lines.in
index d4691c68635be007980e59420aa36ac242ed7714..6f431e233db988a2d5c3e48c6cc354e15ea8f46e 100644 (file)
--- a/tools/command-lines.in
+++ b/tools/command-lines.in
@@ -1359,10 +1359,10 @@ OO: --aligned, --all, --binary, --colon, --columns,
 --configreport ConfigReport, --foreign, --history, --ignorelockingfailure,
 --logonly, --maps, --noheadings,
 --nosuffix, --options String, --sort String, --readonly,
---reportformat ReportFmt, --segments, --select String, --separator String,
+--segments, --select String, --separator String,
 --shared, --unbuffered, --units Units
 OP: VG|LV|Tag ...
-IO: --partial, --ignoreskippedcluster
+IO: --partial, --ignoreskippedcluster, --reportformat ReportFmt
 ID: lvdisplay_general
 
 ---
@@ -1590,10 +1590,10 @@ pvdisplay
 OO: --aligned, --all, --binary, --colon, --columns, --configreport ConfigReport,
 --foreign, --ignorelockingfailure,
 --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
 OP: PV|Tag ...
-IO: --ignoreskippedcluster
+IO: --ignoreskippedcluster, --reportformat ReportFmt
 ID: pvdisplay_general
 
 ---
@@ -1811,10 +1811,10 @@ vgdisplay
 OO: --activevolumegroups, --aligned, --binary, --colon, --columns,
 --configreport ConfigReport, --foreign, --ignorelockingfailure,
 --logonly, --noheadings, --nosuffix,
---options String, --readonly, --reportformat ReportFmt, --select String,
+--options String, --readonly, --select String,
 --shared, --short, --separator String, --sort String, --unbuffered, --units Units
 OP: VG|Tag ...
-IO: --partial, --ignoreskippedcluster
+IO: --partial, --ignoreskippedcluster, --reportformat ReportFmt
 ID: vgdisplay_general
 
 ---

diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index a28d98ecf0a45ab65ce955d6fef90b30b605836d..7e3afc24108e3e25ad69004e7b5b94dfe0535b83 100644 (file)
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -3060,6 +3060,7 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv)
        int i;
        int skip_hyphens;
        int refresh_done = 0;
+       int io;
 
        /* 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 */
@@ -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)))
                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.
         */