[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-314-ge6ca61c

[Stefano Lattarini]

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 Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=e6ca61c1a1bf601cfde4b67c33fe861cafff7450

The branch, maint has been updated
       via  e6ca61c1a1bf601cfde4b67c33fe861cafff7450 (commit)
      from  a118732d1138b169e3c41759b8e3e03945994172 (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 e6ca61c1a1bf601cfde4b67c33fe861cafff7450
Author: Stefano Lattarini <address@hidden>
Date:   Wed Feb 16 20:43:22 2011 +0100

    tests: tempdirs with restrictive permissions are cleaned correctly
    
    Before this change, the removal of a temporary test directory
    containing subdirectories with restrictive permissions (such as
    'r--r--r--') could fail.
    
    * tests/defs: Ensure that all the subdirectories of a temporary
    test directory have the 'read', 'write' and 'execute' bits set,
    before trying to remove it with `rm -rf'.
    * tests/Makefile.am (clean-local-check): Likewise.

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

Summary of changes:
 ChangeLog         |   11 +++++++++++
 tests/Makefile.am |    2 +-
 tests/Makefile.in |    2 +-
 tests/defs.in     |    4 ++--
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4563585..8d03512 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-02-20  Stefano Lattarini  <address@hidden>
+
+       tests: tempdirs with restrictive permissions are cleaned correctly
+       Before this change, the removal of a temporary test directory
+       containing subdirectories with restrictive permissions (such as
+       'r--r--r--') could fail.
+       * tests/defs: Ensure that all the subdirectories of a temporary
+       test directory have the 'read', 'write' and 'execute' bits set,
+       before trying to remove it with `rm -rf'.
+       * tests/Makefile.am (clean-local-check): Likewise.
+
 2011-02-16  Stefano Lattarini  <address@hidden>
            Ralf Wildenhues  <address@hidden>
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ed415f2..047bc7b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -839,6 +839,6 @@ clean-local-check:
         if test "$$#,$$1" = "1,*.dir"; then \
           : there is no test directory to clean; \
         else \
-          find "$$@" -type d '!' -perm -200 -exec chmod u+w {} ';'; \
+          find "$$@" -type d ! -perm -700 -exec chmod u+rwx {} ';'; \
           rm -rf "$$@"; \
         fi;
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 1363930..fe6238b 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1443,7 +1443,7 @@ clean-local-check:
         if test "$$#,$$1" = "1,*.dir"; then \
           : there is no test directory to clean; \
         else \
-          find "$$@" -type d '!' -perm -200 -exec chmod u+w {} ';'; \
+          find "$$@" -type d ! -perm -700 -exec chmod u+rwx {} ';'; \
           rm -rf "$$@"; \
         fi;
 
diff --git a/tests/defs.in b/tests/defs.in
index ffe21e1..fd0cc9c 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -263,7 +263,7 @@ Exit ()
 curdir=`pwd`
 testSubDir=$me.dir
 test ! -d $testSubDir || {
-  find $testSubDir -type d ! -perm -200 -exec chmod u+w {} ";"
+  find $testSubDir -type d ! -perm -700 -exec chmod u+rwx {} ";"
   rm -rf $testSubDir
 }
 mkdir $testSubDir
@@ -275,7 +275,7 @@ if test "$sh_errexit_works" = yes; then
     cd "$curdir"
     case $exit_status,$keep_testdirs in
     0,)
-      find $testSubDir -type d ! -perm -200 -exec chmod u+w {} ";"
+      find $testSubDir -type d ! -perm -700 -exec chmod u+rwx {} ";"
       rm -rf $testSubDir
       ;;
     esac


hooks/post-receive
-- 
GNU Automake