]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
maint: fix syntax-check failure of previous patch
authorEric Blake <eblake@redhat.com>
Tue, 26 Oct 2010 21:50:19 +0000 (15:50 -0600)
committerEric Blake <eblake@redhat.com>
Tue, 26 Oct 2010 21:50:19 +0000 (15:50 -0600)
* cfg.mk (sc_prohibit_trailing_blank_lines): Delete; this is
adequately covered by maint.mk's sc_prohibit_empty_lines_at_EOF.
* .x-sc_prohibit_empty_lines_at_EOF: New file, to exempt raw
patches.
* Makefile.am (EXTRA_DIST): Include new exemption.

.x-sc_prohibit_empty_lines_at_EOF [new file with mode: 0644]
Makefile.am
cfg.mk

diff --git a/.x-sc_prohibit_empty_lines_at_EOF b/.x-sc_prohibit_empty_lines_at_EOF
new file mode 100644 (file)
index 0000000..f481a09
--- /dev/null
@@ -0,0 +1 @@
+^docs/api_extension/.*
index b51bd2b3fca59d1d18fc613204b5fdbf5c0e175b..26c64885bd5a7a6856554f2ea1b1f3e29d8a229e 100644 (file)
@@ -25,6 +25,7 @@ EXTRA_DIST = \
   .x-sc_avoid_write \
   .x-sc_m4_quote_check \
   .x-sc_prohibit_asprintf \
+  .x-sc_prohibit_empty_lines_at_EOF \
   .x-sc_prohibit_gethostby \
   .x-sc_prohibit_gethostname \
   .x-sc_prohibit_gettext_noop \
diff --git a/cfg.mk b/cfg.mk
index d50ffb7f3e62b14118096112d7c0093d2efb6f6c..d238a5f995b3f60ea0a4f23823f68c4c6404cbfd 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -406,15 +406,6 @@ sc_prohibit_newline_at_end_of_diagnostic:
          && { echo '$(ME): newline at end of message(s)' 1>&2;         \
            exit 1; } || :
 
-# Disallow trailing blank lines.
-sc_prohibit_trailing_blank_lines:
-       @$(VC_LIST_EXCEPT) | xargs perl -ln -0777 -e                    \
-         '/\n\n+$$/ and print $$ARGV' > $@-t
-       @found=0; test -s $@-t && { found=1; cat $@-t 1>&2;             \
-         echo '$(ME): found trailing blank line(s)' 1>&2; };           \
-       rm -f $@-t;                                                     \
-       test $$found = 0
-
 # Regex for grep -E that exempts generated files from style rules.
 preprocessor_exempt = ((qemu|remote)_(driver|protocol)\.h)$$
 # Enforce recommended preprocessor indentation style.