diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-06-21 05:34:45 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-06-21 05:34:45 +0000 |
| commit | 8ea55187dfb8c827555e65255f712a387d504751 (patch) | |
| tree | 0a6c2fab0a17387c75c9e6f31d66fced3813fffb /bin/ebuild.sh | |
| parent | 0e0450c495ff5f7a44e5f0e81c459fec99cd6c84 (diff) | |
| download | portage-8ea55187dfb8c827555e65255f712a387d504751.tar.gz portage-8ea55187dfb8c827555e65255f712a387d504751.tar.bz2 portage-8ea55187dfb8c827555e65255f712a387d504751.zip | |
change DOCDESTTREE to _E_DOCDESTTREE_ to try and prevent abuse from ebuild writers (trunk r6347)
svn path=/main/branches/2.1.2/; revision=6902
Diffstat (limited to 'bin/ebuild.sh')
| -rwxr-xr-x | bin/ebuild.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 6ea33964c..a7d5fd871 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -354,7 +354,7 @@ umask 022 export DESTTREE=/usr export INSDESTTREE="" export EXEDESTTREE="" -export DOCDESTTREE="" +export _E_DOCDESTTREE_="" export INSOPTIONS="-m0644" export EXEOPTIONS="-m0755" export LIBOPTIONS="-m0644" @@ -848,11 +848,12 @@ exeinto() { docinto() { if [ "$1" == "/" ]; then - export DOCDESTTREE="" + export _E_DOCDESTTREE_="" + eqawarn "QA Notice: invalid usage of docinto" else - export DOCDESTTREE="$1" - if [ ! -d "${D}usr/share/doc/${PF}/${DOCDESTTREE}" ]; then - install -d "${D}usr/share/doc/${PF}/${DOCDESTTREE}" + export _E_DOCDESTTREE_="$1" + if [ ! -d "${D}usr/share/doc/${PF}/${_E_DOCDESTTREE_}" ]; then + install -d "${D}usr/share/doc/${PF}/${_E_DOCDESTTREE_}" fi fi } |