INN commit: trunk/support (install-sh)

INN Commit Russ_Allbery at isc.org
Thu May 21 17:26:01 UTC 2009


    Date: Thursday, May 21, 2009 @ 10:26:01
  Author: iulius
Revision: 8483

Don't chown directories that already exist.  (Backport commit 6882.)

Modified:
  trunk/support/install-sh

------------+
 install-sh |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Modified: install-sh
===================================================================
--- install-sh	2009-05-21 16:32:58 UTC (rev 8482)
+++ install-sh	2009-05-21 17:26:01 UTC (rev 8483)
@@ -11,7 +11,8 @@
 # overwriting an existing file).  -B takes an argument, the suffix to use.
 # INN invokes this script as install-sh -B .OLD.  Also modified to use
 # cp -p instead of just cp to install programs when invoked as install -c.
-# It also handles .exe extensions, for Cygwin portability.
+# It also handles .exe extensions, for Cygwin portability, and prevents
+# existing directories from being chown'ed.
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -258,6 +259,10 @@
     dstdir=$dst
     test -d "$dstdir"
     dstdir_status=$?
+    # Don't chown directories that already exist (added for INN).
+    if test $dstdir_status = 0; then
+      chowncmd=""
+    fi
   else
 
     # Waiting for this to be detected by the "$cpprog $src $dsttmp" command




More information about the inn-committers mailing list