On 02/08/2015 08:40 PM, Bernhard Voelker wrote:
> diff --git a/cfg.mk b/cfg.mk
> index f5be6de..26df247 100644
> --- a/cfg.mk
> +++ b/cfg.mk
> @@ -611,6 +611,17 @@ sc_THANKS_in_duplicates:
> && { echo '$(ME): remove the above names from THANKS.in' \
> 1>&2; exit 1; } || :
>
> +# Ensure the contributor list stays sorted. The sort order can be fixed
> +# with 'make sort-THANKS.in' ... which uses the same sort options.
> +sc_THANKS_in_sorted:
> + @sed '/^$$/,/^$$/!d;/^$$/d' THANKS.in > $@.1; \
> + LC_ALL='en_US.UTF-8' sort -f -k1,1 $@.1 > $@.2
> + @diff -u $@.1 $@.2; diff=$$?; \
> + rm -f $@.1 $@.2; \
> + test "$$diff" = 0 \
> + || { echo '$(ME): THANKS.in is unsorted; please run' \
> + 'make sort-THANKS.in' 1>&2; exit 1; }
> +
> # Look for developer diagnostics that are marked for translation.
> # This won't find any for which devmsg's format string is on a separate line.
> sc_marked_devdiagnostics:
Bummer, sc_makefile_TAB_only_indentation complained after local commit.
This diff on top of the patch fixes it:
diff --git a/cfg.mk b/cfg.mk
index 26df247..9215ec7 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -620,7 +620,7 @@ sc_THANKS_in_sorted:
rm -f $@.1 $@.2; \
test "$$diff" = 0 \
|| { echo '$(ME): THANKS.in is unsorted; please run' \
- 'make sort-THANKS.in' 1>&2; exit 1; }
+ 'make sort-THANKS.in' 1>&2; exit 1; }
# Look for developer diagnostics that are marked for translation.
# This won't find any for which devmsg's format string is on a separate line.
Have a nice day,
Berny
