This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "GNU Libtool".
The branch, master has been updated via 40bc0628d5c8c9790164e76c9ab07ab170e2eafd (commit) from b89a47eae6d81a039f2ab36a8c510586f39afbd9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 40bc0628d5c8c9790164e76c9ab07ab170e2eafd Author: Pavel Raiskup <prais...@redhat.com> Date: Wed Feb 17 16:27:25 2016 +0100 edit-readme-alpha: generate the "stable" README properly Fixes bug#20196. Reported by Peter Johansson and KO Myung-Hun * build-aux/edit-readme-alpha: Invert the order of checks and exit sooner if the file was already edited. Also fix the typo 's/sed -n/sed/' (to print the rest of the file). * Makefile.am ($(readme)): Double-quote the `cmd` to let test -n work correctly. ----------------------------------------------------------------------- Summary of changes: Makefile.am | 2 +- NO-THANKS | 1 + build-aux/edit-readme-alpha | 16 +++++++++------- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index 5a4a802..d8ccfae 100644 --- a/Makefile.am +++ b/Makefile.am @@ -599,7 +599,7 @@ $(dotversion): EXTRA_DIST += $(edit_readme_alpha) re_alpha_version = '\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*[-\.][-\.0-9a-z]*\)' $(readme): FORCE - @if test -n `expr $(VERSION) : $(re_alpha_version)`; then \ + @if test -n "`expr $(VERSION) : $(re_alpha_version)`"; then \ if test 0 = '$(AM_DEFAULT_VERBOSITY)' && test 1 != '$(V)'; \ then echo " GEN " $@; \ else echo "$(SHELL) $(edit_readme_alpha) $@"; fi; \ diff --git a/NO-THANKS b/NO-THANKS index 090c863..6b83e60 100644 --- a/NO-THANKS +++ b/NO-THANKS @@ -121,6 +121,7 @@ Pavel Raiskup prais...@redhat.com PaweŠDaniluk pa...@bioexploratorium.pl Peter Fritzsche peter.fritzs...@gmx.de Peter Jeremy peterjer...@optushome.com.au +Peter Johansson troj...@gmail.com Peter Kjellerstedt peter.kjellerst...@axis.com Pádraig Brady p...@draigbrady.com Richard B. Kreckel krec...@ginac.de diff --git a/build-aux/edit-readme-alpha b/build-aux/edit-readme-alpha index 3291fd0..6bf7082 100755 --- a/build-aux/edit-readme-alpha +++ b/build-aux/edit-readme-alpha @@ -62,16 +62,18 @@ for file in "$@"; do continue } + # Did we already in-place edited this file? + matched=`sed -n -e '/^This is an alpha testing release/,/a consistent, portable interface\.$/p' $file \ + |wc -l |sed 's|^ *||'` + test 3 = "$matched" && { + echo "$progname: $file already edited" >&2 + continue + } + # Make sure the paragraph we are matching has not been edited since # this script was written. matched=`sed -n -e '/^\[GNU Libtool\]\[libtool\] is/,/^consistent, portable interface\.$/p' $file \ |wc -l |sed 's|^ *||'` - - # Unless, of course, it was edited by this script already. - test 3 = "$matched" \ - || matched=`sed -n -e '/^This is an alpha testing release/,/a consistent, portable interface\.$/p' $file \ - |wc -l |sed 's|^ *||'` - test 3 = "$matched" \ || func_fatal_error "$file format has changed, please fix '$0'" @@ -79,7 +81,7 @@ for file in "$@"; do trap 'x=$?; rm $file.T; exit $x' 1 2 13 15 # Edit the first paragraph to be suitable for an alpha release. - sed -n '/^\[GNU Libtool\]\[libtool\] is/,/^consistent, portable interface\.$/c\ + sed '/^\[GNU Libtool\]\[libtool\] is/,/^consistent, portable interface\.$/c\ This is an alpha testing release of [GNU Libtool][libtool], a generic\ library support script. [Libtool][] hides the complexity of using shared\ libraries behind a consistent, portable interface.' $file > $file.T hooks/post-receive -- GNU Libtool