diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-06-21 05:36:33 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-06-21 05:36:33 +0000 |
| commit | ca33bea20805c7b6a136d84a8a556f029ba51556 (patch) | |
| tree | 1c2cc6f912ea09271393bb38f2f3f78d84f963c7 /bin/ebuild.sh | |
| parent | 8ea55187dfb8c827555e65255f712a387d504751 (diff) | |
| download | portage-ca33bea20805c7b6a136d84a8a556f029ba51556.tar.gz portage-ca33bea20805c7b6a136d84a8a556f029ba51556.tar.bz2 portage-ca33bea20805c7b6a136d84a8a556f029ba51556.zip | |
change "EXEDESTTREE" to "_E_EXEDESTTREE_" to try and prevent abuse from ebuild writers (trunk r6351)
svn path=/main/branches/2.1.2/; revision=6903
Diffstat (limited to 'bin/ebuild.sh')
| -rwxr-xr-x | bin/ebuild.sh | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index a7d5fd871..30b929957 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -353,7 +353,7 @@ dump_trace() { umask 022 export DESTTREE=/usr export INSDESTTREE="" -export EXEDESTTREE="" +export _E_EXEDESTTREE_="" export _E_DOCDESTTREE_="" export INSOPTIONS="-m0644" export EXEOPTIONS="-m0755" @@ -837,11 +837,11 @@ insinto() { exeinto() { if [ "$1" == "/" ]; then - export EXEDESTTREE="" + export _E_EXEDESTTREE_="" else - export EXEDESTTREE="$1" - if [ ! -d "${D}${EXEDESTTREE}" ]; then - install -d "${D}${EXEDESTTREE}" + export _E_EXEDESTTREE_="$1" + if [ ! -d "${D}${_E_EXEDESTTREE_}" ]; then + install -d "${D}${_E_EXEDESTTREE_}" fi fi } @@ -849,7 +849,6 @@ exeinto() { docinto() { if [ "$1" == "/" ]; then export _E_DOCDESTTREE_="" - eqawarn "QA Notice: invalid usage of docinto" else export _E_DOCDESTTREE_="$1" if [ ! -d "${D}usr/share/doc/${PF}/${_E_DOCDESTTREE_}" ]; then |