Show string with invalid pattern

and start error message with capital letter.

diff --git a/WHATS_NEW b/WHATS_NEW
index c73b9cdbfc75ae81abf310bb7c07e85e2f0084a0..e15258acbcc40cbc951a0ec12acfebc56e7965fc 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.64 -
 =================================
+  Display invalid regex pattern for filter configuration in case of error.
   Remove no-longer-used arg_ptr_value.
   Fix -M and --type to use strings not pointers that change on config refresh.
   Fix lvconvert error message when existing mirrored LV is not found.

diff --git a/lib/filters/filter-regex.c b/lib/filters/filter-regex.c
index 1d415a42ac47969aa30545c8975afed8a8ed34fd..c062402155d88d091d04b30803e590bf0b02b305 100644 (file)
--- a/lib/filters/filter-regex.c
+++ b/lib/filters/filter-regex.c
@@ -103,7 +103,7 @@ static int _build_matcher(struct rfilter *rf, struct config_value *val)
         */
        for (v = val; v; v = v->next) {
                if (v->type != CFG_STRING) {
-                       log_error("filter patterns must be enclosed in quotes");
+                       log_error("Filter patterns must be enclosed in quotes.");
                        goto out;
                }
 
@@ -128,7 +128,7 @@ static int _build_matcher(struct rfilter *rf, struct config_value *val)
         */
        for (v = val, i = count - 1; v; v = v->next, i--)
                if (!_extract_pattern(scratch, v->v.str, regex, rf->accept, i)) {
-                       log_error("invalid filter pattern");
+                       log_error("Invalid filter pattern \"%s\".", v->v.str);
                        goto out;
                }