[SCM] GNU Libtool branch, master, updated. v2.4.2-370-g2e40f72

[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  2e40f7209a10b9d814f558784eb5018d5e404be3 (commit)
      from  8d2a63c23a2dfb424e4b2f934c73c1737f979062 (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 2e40f7209a10b9d814f558784eb5018d5e404be3
Author: Gary V. Vaughan <address@hidden>
Date:   Sun Jan 27 21:07:27 2013 +0700

    bootstrap: fix func_insert_if_absent bugs.
    
    * gl/build-aux/bootstrap.in (func_insert_if_absent): Print verbose
    message when there is a new entry to add.
    Also, make sure to update the .gitignore file when changed.
    * bootstrap: Regenerate.
    * THANKS: Add Pádraig Brady.
    Reported by Pádraig Brady.
    
    Signed-off-by: Gary V. Vaughan <address@hidden>

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

Summary of changes:
 THANKS                    |    1 +
 bootstrap                 |    6 +++---
 gl/build-aux/bootstrap.in |    6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/THANKS b/THANKS
index 92e6dff..7f3eb62 100644
--- a/THANKS
+++ b/THANKS
@@ -150,6 +150,7 @@
   Nix                          address@hidden
   Olaf Lenz                    address@hidden
   Olly Betts                   address@hidden
+  Pádraig Brady                       address@hidden
   Patrice Fromy                        address@hidden
   Patrick Welche               address@hidden
   Paul Biggar                  address@hidden
diff --git a/bootstrap b/bootstrap
index 2297205..8232a44 100755
--- a/bootstrap
+++ b/bootstrap
@@ -4380,14 +4380,14 @@ func_insert_if_absent ()
       test -n "$duplicate_entries" \
           && func_error "duplicate entries in $file: " $duplicate_entries
 
-      func_grep_q "$str" "$file" \
-          && func_verbose "inserting '$str' into '$file'"
+      func_grep_q "^$str\$" "$file" \
+          || func_verbose "inserting '$str' into '$file'"
 
       linesold=`func_gitignore_entries "$file" |wc -l`
       linesnew=`$bs_echo "$str" \
                 |func_gitignore_entries - "$file" |sort -u |wc -l`
       test "$linesold" -eq "$linesnew" \
-        || sed "1i\\$nl$str$nl" "$file" \
+        || { sed "1i\\$nl$str$nl" "$file" >"$file"T && mv "$file"T "$file"; } \
         || func_permissions_error "$file"
     done
 }
diff --git a/gl/build-aux/bootstrap.in b/gl/build-aux/bootstrap.in
index bfd4ad6..8af0c89 100755
--- a/gl/build-aux/bootstrap.in
+++ b/gl/build-aux/bootstrap.in
@@ -2190,14 +2190,14 @@ func_insert_if_absent ()
       test -n "$duplicate_entries" \
           && func_error "duplicate entries in $file: " $duplicate_entries
 
-      func_grep_q "$str" "$file" \
-          && func_verbose "inserting '$str' into '$file'"
+      func_grep_q "^$str\$" "$file" \
+          || func_verbose "inserting '$str' into '$file'"
 
       linesold=`func_gitignore_entries "$file" |wc -l`
       linesnew=`$bs_echo "$str" \
                 |func_gitignore_entries - "$file" |sort -u |wc -l`
       test "$linesold" -eq "$linesnew" \
-        || sed "1i\\$nl$str$nl" "$file" \
+        || { sed "1i\\$nl$str$nl" "$file" >"$file"T && mv "$file"T "$file"; } \
         || func_permissions_error "$file"
     done
 }


hooks/post-receive
-- 
GNU Libtool