[SCM] GNU Libtool branch, master, updated. v2.2.10-205-g850f417

[Gary V. Vaughan]

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  850f41781e1c5e98b71457d1375231b1fa581325 (commit)
      from  627373516c5b0f0228b004eb03a397b782638128 (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 850f41781e1c5e98b71457d1375231b1fa581325
Author: Gary V. Vaughan <address@hidden>
Date:   Tue Sep 21 07:57:15 2010 +0700

    maint: edit-readme-alpha shouldn't try to re-edit during dist.
    
    * libltdl/config/edit-readme-alpha: If README is non-writable
    assume that it is being run from distcheck, and bail out with
    a warning (to help diagnose cases where the heuristic is not
    correct).  However, if README has already been edited to the
    alpha text, quietly skip without an error message.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                        |    9 +++++++++
 libltdl/config/edit-readme-alpha |   17 +++++++++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ceb193c..4934ce5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-21  Gary V. Vaughan  <address@hidden>
+
+       maint: edit-readme-alpha shouldn't try to re-edit during dist.
+       * libltdl/config/edit-readme-alpha: If README is non-writable
+       assume that it is being run from distcheck, and skip the edit
+       with a warning (to help diagnose cases where the heuristic is
+       not correct).  However, if README has already been edited to
+       the alpha text, quietly skip without an error message.
+
 2010-09-20  Eric Blake  <address@hidden>
 
        maint: drop autobuild requirement
diff --git a/libltdl/config/edit-readme-alpha b/libltdl/config/edit-readme-alpha
index 6070a31..ee6ca6b 100755
--- a/libltdl/config/edit-readme-alpha
+++ b/libltdl/config/edit-readme-alpha
@@ -55,10 +55,23 @@ func_fatal_error ()
 
 
 for file in "$@"; do
+  # Assume that read-only README indicates that we are running inside
+  # the latter part of a `make distcheck'.
+  test -w $file || {
+    echo "$progname: not editing non-writeable \`$file' (distcheck?)" >&2
+    continue
+  }
+
   # Make sure the paragraph we are matching has not been edited since
   # this script was written.
-  matched=`sed -n -e '/^This is GNU Libtool,/,/^interface.$/p' $file \
-      |wc -l |sed 's|^ *||'`
+  matched=`sed -n -e '/^This is GNU Libtool,/,/^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/,/behind a 
consistent, portable interface\.$/p' $file \
+                  |wc -l |sed 's|^ *||'`
+
   test 3 = "$matched" \
       || func_fatal_error "$file format has changed, please fix \`$0'"
 


hooks/post-receive
-- 
GNU Libtool