On 8/13/19 8:10 PM, Bernhard Voelker wrote:
> I'd only like to see following additional changes:
> 
> - make the script callable from an arbitrary directory, i.e.,
>   make the file name of the patches relative to the script, and
> 
> - mention to adjust MANPATH (because that also works with the
>   common directory: 'man df-8.23').
> 
> WDYT?

... and we need to make
  sc_prohibit_tab_based_indentation and
  sc_long_lines
happy again.

(BTW: The latter would alternatively be fixed if the patches would
be named *.diff instead of *.patch.)

Have a nice day,
Berny

diff --git a/cfg.mk b/cfg.mk
index 2bc933c8b..c1a32a153 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -860,9 +860,10 @@ exclude_file_name_regexp--sc_space_before_open_paren = 
$(_ll)

 tbi_1 = ^tests/pr/|(\.mk|^man/help2man)$$
 tbi_2 = ^scripts/git-hooks/(pre-commit|pre-applypatch|applypatch-msg)$$
-tbi_3 = (GNU)?[Mm]akefile(\.am)?$$|$(_ll)
+tbi_3 = ^scripts/build-older-versions/coreutils-5\.97-on-glibc-2\.28\.patch$$
+tbi_4 = (GNU)?[Mm]akefile(\.am)?$$|$(_ll)
 exclude_file_name_regexp--sc_prohibit_tab_based_indentation = \
-  $(tbi_1)|$(tbi_2)|$(tbi_3)
+  $(tbi_1)|$(tbi_2)|$(tbi_3)|$(tbi_4)

 exclude_file_name_regexp--sc_preprocessor_indentation = \
   ^(gl/lib/rand-isaac\.[ch]|gl/tests/test-rand-isaac\.c)$$|$(_ll)
@@ -888,7 +889,7 @@ exclude_file_name_regexp--sc_prohibit-gl-attributes = 
^src/libstdbuf\.c$$
 exclude_file_name_regexp--sc_prohibit_uppercase_id_est = \.diff$$
 exclude_file_name_regexp--sc_ensure_dblspace_after_dot_before_id_est = \.diff$$
 exclude_file_name_regexp--sc_ensure_comma_after_id_est = \.diff|$(_ll)$$
-exclude_file_name_regexp--sc_long_lines = \.diff$$|$(_ll)
+exclude_file_name_regexp--sc_long_lines = \.diff$$|\.patch|$(_ll)

 # Augment AM_CFLAGS to include our per-directory options:
 AM_CFLAGS += $($(@D)_CFLAGS)

Reply via email to