summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-04-07 04:32:47 +0000
committerMike Frysinger <vapier@gentoo.org>2007-04-07 04:32:47 +0000
commit9bee41447359bffdf11e5b38f20db8cff7207ac8 (patch)
treeff593019bffd2d420234c5b64fac23397d53e149
parent2be3320b8b8119613f49bbc6fe532db6a80e33d5 (diff)
downloadportage-9bee41447359bffdf11e5b38f20db8cff7207ac8.tar.gz
portage-9bee41447359bffdf11e5b38f20db8cff7207ac8.tar.bz2
portage-9bee41447359bffdf11e5b38f20db8cff7207ac8.zip
change "DOCDESTTREE" to "_E_DOCDESTTREE_" to try and prevent abuse from ebuild writers
svn path=/main/trunk/; revision=6347
-rwxr-xr-xbin/dodoc2
-rwxr-xr-xbin/dohtml4
-rwxr-xr-xbin/ebuild.sh11
3 files changed, 9 insertions, 8 deletions
diff --git a/bin/dodoc b/bin/dodoc
index 4a89aa061..a9e33c9e4 100755
--- a/bin/dodoc
+++ b/bin/dodoc
@@ -8,7 +8,7 @@ if [ $# -lt 1 ] ; then
exit 1
fi
-dir="${D}usr/share/doc/${PF}/${DOCDESTTREE}"
+dir="${D}usr/share/doc/${PF}/${_E_DOCDESTTREE_}"
if [ ! -d "${dir}" ] ; then
install -d "${dir}"
fi
diff --git a/bin/dohtml b/bin/dohtml
index cdffad645..917ca1b52 100755
--- a/bin/dohtml
+++ b/bin/dohtml
@@ -77,8 +77,8 @@ class OptionsClass:
self.PF = os.environ["PF"]
if os.environ.has_key("D"):
self.D = os.environ["D"]
- if os.environ.has_key("DOCDESTTREE"):
- self.DOCDESTTREE = os.environ["DOCDESTTREE"]
+ if os.environ.has_key("_E_DOCDESTTREE_"):
+ self.DOCDESTTREE = os.environ["_E_DOCDESTTREE_"]
self.allowed_exts = [ 'png', 'gif', 'html', 'htm', 'jpg', 'css', 'js' ]
self.allowed_files = []
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 7951619c3..8f866d7b8 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -271,7 +271,7 @@ umask 022
export DESTTREE=/usr
export INSDESTTREE=""
export EXEDESTTREE=""
-export DOCDESTTREE=""
+export _E_DOCDESTTREE_=""
export INSOPTIONS="-m0644"
export EXEOPTIONS="-m0755"
export LIBOPTIONS="-m0644"
@@ -761,11 +761,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
}