From 8ca1979eb24c2f084bc3b2d1d51895a17175f43f Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Sun, 7 Apr 2019 19:04:08 -0400 Subject: [PATCH] cfg.mk: Only force _LAST enum on VIR_ENUM_IMPL second line Drop the checking for _LAST optionally on the first line, previous patch removed all those instances Signed-off-by: Cole Robinson --- cfg.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cfg.mk b/cfg.mk index bb684f381d..b785089910 100644 --- a/cfg.mk +++ b/cfg.mk @@ -809,11 +809,11 @@ sc_prohibit_cross_inclusion: sc_require_enum_last_marker: @$(VC_LIST_EXCEPT) | xargs \ $(GREP) -A1 -nE '^[^#]*VIR_ENUM_IMPL *\(' /dev/null \ - | $(SED) -ne '/VIR_ENUM_IMPL[^,]*,$$/N' \ - -e '/VIR_ENUM_IMPL[^,]*,[^,]*[^_,][^L,][^A,][^S,][^T,],/p' \ + | $(SED) -ne '/VIR_ENUM_IMPL.*,$$/N' \ + -e '/VIR_ENUM_IMPL[^,]*,[^,]*,[^,]*[^_,][^L,][^A,][^S,][^T,],/p' \ -e '/VIR_ENUM_IMPL[^,]*,[^,]\{0,4\},/p' \ | $(GREP) . && \ - { echo '$(ME): enum impl needs to use _LAST marker' 1>&2; \ + { echo '$(ME): enum impl needs _LAST marker on second line' 1>&2; \ exit 1; } || : # In Python files we don't want to end lines with a semicolon like in C -- 2.47.2