]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
maint: avoid false positives on unmarked diagnostics
authorEric Blake <eblake@redhat.com>
Mon, 30 Apr 2012 21:55:13 +0000 (15:55 -0600)
committerCole Robinson <crobinso@redhat.com>
Thu, 7 Jun 2012 22:06:16 +0000 (18:06 -0400)
Otherwise, a string such as _("Don't use \"" VAR "\".") would
complain about unmarked diagnostics.

* cfg.mk (sc_libvirt_unmarked_diagnostics): Handle \" in message.
(cherry picked from commit 8f3728f85366d99568134053c959ba32ffb0e662)

cfg.mk

diff --git a/cfg.mk b/cfg.mk
index 71e9a1d9014d7568bd727271cdb6877484c3451d..b517e7ccb2ccb2164ea29fe8493f2b3c8e093605 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -592,7 +592,7 @@ sc_libvirt_unmarked_diagnostics:
          $(_sc_search_regexp)
        @{ grep     -nE '\<$(func_re) *\(.*;$$' $$($(VC_LIST_EXCEPT));   \
           grep -A1 -nE '\<$(func_re) *\(.*,$$' $$($(VC_LIST_EXCEPT)); } \
-          | sed 's/_("[^"][^"]*"//;s/[  ]"%s"//'                       \
+          | sed 's/_("\([^\"]\|\\.\)\+"//;s/[   ]"%s"//'               \
           | grep '[     ]"' &&                                         \
          { echo '$(ME): found unmarked diagnostic(s)' 1>&2;            \
            exit 1; } || :