From: Eric Blake <eblake@redhat.com>
Date: Mon, 30 Apr 2012 21:55:13 +0000 (-0600)
Subject: maint: avoid false positives on unmarked diagnostics
X-Git-Tag: v0.9.11.4~129
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2cb6a0e887aeceee84940cc6f870fe1ee5e439bf;p=thirdparty%2Flibvirt.git

maint: avoid false positives on unmarked diagnostics

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)
---

diff --git a/cfg.mk b/cfg.mk
index 71e9a1d901..b517e7ccb2 100644
--- 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; } || :