summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Mauch <genone@gentoo.org>2005-05-04 18:00:40 +0000
committerMarius Mauch <genone@gentoo.org>2005-05-04 18:00:40 +0000
commit677e002a445663fcf1828a65eca7e3b86ad13d4d (patch)
treefe8141778cbf72597ac09a0342771b1dfc9b3af8
parentrm -f g-cpan.pl (diff)
downloadportage-cvs-677e002a445663fcf1828a65eca7e3b86ad13d4d.tar.gz
portage-cvs-677e002a445663fcf1828a65eca7e3b86ad13d4d.tar.bz2
portage-cvs-677e002a445663fcf1828a65eca7e3b86ad13d4d.zip
stupid conflicts
-rwxr-xr-xbin/ebuild.sh7
1 files changed, 1 insertions, 6 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index fd426a3..7f35282 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.30 2005/05/04 17:58:37 genone Exp $
+# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/ebuild.sh,v 1.201.2.31 2005/05/04 18:00:40 genone 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}"
@@ -1085,12 +1085,7 @@ dyn_install() {
count=0
find "${D}/" -group portage | while read file; do
-<<<<<<< ebuild.sh
- # Too annoying
- # ewarn "file $file was installed with group portage!"
-=======
count=$(( $count + 1 ))
->>>>>>> 1.201.2.25
s=$(stat_perms "$file")
if [ "$USERLAND" == "BSD" ] || [ "$USERLAND" == "Darwin" ];then
chgrp wheel "$file"