Skip protecting ownership of symlinks. Patch by truedfx #94199

2 files changed, 9 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index ece9db1..bc90ead 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,15 @@
 # ChangeLog for Portage; the Gentoo Linux ports system 
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Id: ChangeLog,v 1.796.2.145 2005/08/15 02:58:19 vapier Exp $
+# $Id: ChangeLog,v 1.796.2.146 2005/08/20 17:24:30 jstubbs Exp $
 
   MAJOR CHANGES in 2.0.51:
     1. /var/cache/edb/virtuals is no longer used at all. It's calculated now.
     2. /var/cache/edb/world is now /var/lib/portage/world.
     3. /etc/portage/profile/virtuals is _USER_ configs only.
 
+  21 Aug 2005; Jason Stubbs <jstubbs@gentoo.org> bin/ebuild.sh: Skip protecting
+  ownership of symlinks. Patch by truedfx #94199
+
   14 Aug 2005; Mike Frysinger <vapier@gentoo.org> bin/prepstrip:
   Don't try to strip if `file` failed #102499 by Daniel Drake.
 
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index c56087c..c0b2cd2 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/ebuild.sh,v 1.201.2.41 2005/08/16 23:34:19 vapier Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/ebuild.sh,v 1.201.2.42 2005/08/20 17:24:30 jstubbs Exp $
 
 export SANDBOX_PREDICT="${SANDBOX_PREDICT}:/proc/self/maps:/dev/console:/usr/lib/portage/pym:/dev/random"
 export SANDBOX_WRITE="${SANDBOX_WRITE}:/dev/shm:${PORTAGE_TMPDIR}"
@@ -1070,13 +1070,13 @@ dyn_install() {
 	local count=0
 	find "${D}/" -user  portage | while read file; do
 		count=$(( $count + 1 ))
-		s=$(stat_perms "$file")
+		[[ ! -L "${file}" ]] && s=$(stat_perms "$file")
 		if [ -z "${s}" ]; then
 			ewarn "failed stat_perm'ing $file.  User intervention during install isn't wise..."
 			continue
 		fi
 		chown root "$file"
-		chmod "$s" "$file"
+		[[ ! -L "${file}" ]] && chmod "$s" "$file"
 	done
 	if (( $count > 0 )); then
 		ewarn "$count files were installed with user portage!"
@@ -1085,13 +1085,13 @@ dyn_install() {
 	count=0
 	find "${D}/" -group portage | while read file; do
 		count=$(( $count + 1 ))
-		s=$(stat_perms "$file")
+		[[ ! -L "${file}" ]] && s=$(stat_perms "$file")
 		if [ -z "${s}" ]; then
 			echo "failed stat_perm'ing '$file' . User intervention during install isn't wise..."
 			continue
 		fi
 		chgrp 0 "${file}"
-		chmod "$s" "$file"
+		[[ ! -L "${file}" ]] && chmod "$s" "$file"
 	done
 	if (( $count > 0 )); then
 		ewarn "$count files were installed with group portage!"