| Message ID | 4999fcfcd56a2eb17143ca344fbe726058211569.1554737741.git.crobinso@redhat.com |
|---|---|
| State | Accepted |
| Commit | 8ca1979eb24c2f084bc3b2d1d51895a17175f43f |
| Headers | show |
| Series | Add 'label' arg to VIR_ENUM_IMPL | expand |
On Mon, Apr 08, 2019 at 11:48:17AM -0400, Cole Robinson wrote: > Drop the checking for _LAST optionally on the first line, previous > patch removed all those instances > > Signed-off-by: Cole Robinson <crobinso@redhat.com> > --- > cfg.mk | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Regards, Daniel
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
Drop the checking for _LAST optionally on the first line, previous patch removed all those instances Signed-off-by: Cole Robinson <crobinso@redhat.com> --- cfg.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list