Suppress 'Unrecognised field' error if report field is 'help'.

diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index f0498a94e827808de3cfac98c13232f29a322d23..3afa7ecf7ac2e2b163ec2f837c1c9020ea8ad3a8 100644 (file)
--- a/WHATS_NEW_DM
+++ b/WHATS_NEW_DM
@@ -1,5 +1,6 @@
 Version 1.02.16 -
 ===================================
+  Suppress 'Unrecognised field' error if report field is 'help'.
   Add --separator and --sort to dmsetup (unused).
   Make alignment flag optional when specifying report fields.
 

diff --git a/libdm/libdm-report.c b/libdm/libdm-report.c
index 3f835f0fdc7c76098506200cb94c0849e717e728..c6852a9a0a0e0c9b21e24b2b37bd67a63742ac3b 100644 (file)
--- a/libdm/libdm-report.c
+++ b/libdm/libdm-report.c
@@ -416,8 +416,9 @@ static int _parse_options(struct dm_report *rh, const char *format)
                if (!_field_match(rh, ws, (size_t) (we - ws))) {
                        _display_fields(rh);
                        log_print(" ");
-                       log_error("dm_report: Unrecognised field: %.*s",
-                                 (int) (we - ws), ws);
+                       if (strcasecmp(ws, "help") && strcmp(ws, "?"))
+                               log_error("Unrecognised field: %.*s",
+                                         (int) (we - ws), ws);
                        return 0;
                }
        }