diff options
author | Zac Medico <zmedico@gentoo.org> | 2011-11-01 19:17:19 -0700 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2011-11-01 19:17:19 -0700 |
commit | 1af0c40b1300651ca03a7509f49f152c1e595736 (patch) | |
tree | 6d967ae665bf98c9ba8219fb812a9678a127a57e /bin/ebuild-helpers/prepinfo | |
parent | 889853171246ab1063bb5015caf41a41761f5424 (diff) | |
download | portage-1af0c40b1300651ca03a7509f49f152c1e595736.tar.gz portage-1af0c40b1300651ca03a7509f49f152c1e595736.tar.bz2 portage-1af0c40b1300651ca03a7509f49f152c1e595736.zip |
Add EPREFIX and ED support in all ebuild helpers.
This allows our prefix tests to use helpers like insinto, doins, and dosym.
Diffstat (limited to 'bin/ebuild-helpers/prepinfo')
-rwxr-xr-x | bin/ebuild-helpers/prepinfo | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/bin/ebuild-helpers/prepinfo b/bin/ebuild-helpers/prepinfo index 691fd1372..afe214c6b 100755 --- a/bin/ebuild-helpers/prepinfo +++ b/bin/ebuild-helpers/prepinfo @@ -4,17 +4,19 @@ source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh +case "$EAPI" in 0|1|2) ED=${D} ;; esac + if [[ -z $1 ]] ; then infodir="/usr/share/info" else - if [[ -d ${D}$1/share/info ]] ; then + if [[ -d ${ED}$1/share/info ]] ; then infodir="$1/share/info" else infodir="$1/info" fi fi -if [[ ! -d ${D}${infodir} ]] ; then +if [[ ! -d ${ED}${infodir} ]] ; then if [[ -n $1 ]] ; then vecho "${0##*/}: '${infodir}' does not exist!" exit 1 @@ -23,7 +25,7 @@ if [[ ! -d ${D}${infodir} ]] ; then fi fi -find "${D}${infodir}" -type d -print0 | while read -r -d $'\0' x ; do +find "${ED}${infodir}" -type d -print0 | while read -r -d $'\0' x ; do for f in "${x}"/.keepinfodir*; do [[ -e ${f} ]] && continue 2 done |