From 0c463dd0aa962c405b1be32c925acf9891c96bfc Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 4 Aug 2009 14:21:32 +0200 Subject: [PATCH] build: remove trailing blank lines; enable the syntax-check rule * cfg.mk (disable_temporarily): Remove sc_prohibit_trailing_blank_lines. * appliance/Makefile.am: Remove trailing blank line(s). * appliance/debian/modules/y0_install-guestfsd: Likewise. * appliance/make.sh.in: Likewise. * appliance/packagelist.in: Likewise. * appliance/update.sh.in: Likewise. * haskell/run-bindtests: Likewise. * ocaml/run-bindtests: Likewise. * python/run-python-tests: Likewise. * recipes/squashfs.example: Likewise. * ruby/run-ruby-tests: Likewise. --- appliance/Makefile.am | 1 - appliance/debian/modules/y0_install-guestfsd | 1 - appliance/make.sh.in | 1 - appliance/packagelist.in | 1 - appliance/update.sh.in | 1 - cfg.mk | 1 - haskell/run-bindtests | 1 - ocaml/run-bindtests | 1 - python/run-python-tests | 1 - recipes/squashfs.example | 1 - ruby/run-ruby-tests | 1 - 11 files changed, 11 deletions(-) diff --git a/appliance/Makefile.am b/appliance/Makefile.am index 8391b8b..d1338bf 100644 --- a/appliance/Makefile.am +++ b/appliance/Makefile.am @@ -146,4 +146,3 @@ CLEANFILES = $(APPLIANCE_FILES) packagelist kmod.whitelist supermin.incfiles clean-local: rm -rf $(top_builddir)/initramfs - diff --git a/appliance/debian/modules/y0_install-guestfsd b/appliance/debian/modules/y0_install-guestfsd index 17bbbdc..c95e4f0 100755 --- a/appliance/debian/modules/y0_install-guestfsd +++ b/appliance/debian/modules/y0_install-guestfsd @@ -30,4 +30,3 @@ rm -rf "$DEBIRF_ROOT"/usr/share/man/ echo $PWD install -o root -g root -m 0755 ../daemon/guestfsd "$DEBIRF_ROOT"/sbin/guestfsd install -o root -g root -m 0755 init "$DEBIRF_ROOT"/sbin/init - diff --git a/appliance/make.sh.in b/appliance/make.sh.in index a132ed8..d76c961 100755 --- a/appliance/make.sh.in +++ b/appliance/make.sh.in @@ -145,4 +145,3 @@ elif [ "@DIST@" = "DEBIAN" ]; then mkdir -p @top_builddir@/initramfs touch @top_builddir@/initramfs/fakeroot.log fi - diff --git a/appliance/packagelist.in b/appliance/packagelist.in index 9dbef11..be45fc4 100644 --- a/appliance/packagelist.in +++ b/appliance/packagelist.in @@ -39,4 +39,3 @@ ntfs-3g procps strace zerofree - diff --git a/appliance/update.sh.in b/appliance/update.sh.in index cdc441b..0222a75 100755 --- a/appliance/update.sh.in +++ b/appliance/update.sh.in @@ -46,4 +46,3 @@ elif [ "@DIST@" = "DEBIAN" ]; then ln -sf debian/debirf-libguestfs_@REPO@*.cgz $output ln -sf debian/vmlinuz-* $vmlinuz fi - diff --git a/cfg.mk b/cfg.mk index 2b37450..1d02b24 100644 --- a/cfg.mk +++ b/cfg.mk @@ -67,7 +67,6 @@ disable_temporarily = \ sc_prohibit_ctype_h \ sc_prohibit_asprintf \ sc_m4_quote_check \ - sc_prohibit_trailing_blank_lines \ sc_avoid_ctype_macros \ sc_avoid_write diff --git a/haskell/run-bindtests b/haskell/run-bindtests index ce01af9..f9ea434 100755 --- a/haskell/run-bindtests +++ b/haskell/run-bindtests @@ -20,4 +20,3 @@ set -e ./Bindtests > bindtests.tmp diff -u ../bindtests bindtests.tmp - diff --git a/ocaml/run-bindtests b/ocaml/run-bindtests index a9162c9..5200fec 100755 --- a/ocaml/run-bindtests +++ b/ocaml/run-bindtests @@ -20,4 +20,3 @@ set -e ./bindtests > bindtests.tmp diff -u ../bindtests bindtests.tmp - diff --git a/python/run-python-tests b/python/run-python-tests index 90e38b3..487f8ab 100755 --- a/python/run-python-tests +++ b/python/run-python-tests @@ -21,4 +21,3 @@ set -e for f in t/*.py; do python $f done - diff --git a/recipes/squashfs.example b/recipes/squashfs.example index f10d195..af40dd5 100644 --- a/recipes/squashfs.example +++ b/recipes/squashfs.example @@ -34,4 +34,3 @@ drwxr-xr-x 18 root root 0 May 29 08:44 .. -rw-r--r-- 1 root root 2938 Apr 10 12:15 PAM.8.gz -rw-r--r-- 1 root root 736 Feb 24 20:25 PolicyKit.8.gz lrwxrwxrwx 1 root root 15 May 14 06:41 accept.8.gz -> cupsaccept.8.gz - diff --git a/ruby/run-ruby-tests b/ruby/run-ruby-tests index b371bfb..6bf898b 100755 --- a/ruby/run-ruby-tests +++ b/ruby/run-ruby-tests @@ -19,4 +19,3 @@ set -e rake test "$@" - -- 1.8.3.1