From 1af0c40b1300651ca03a7509f49f152c1e595736 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 1 Nov 2011 19:17:19 -0700 Subject: Add EPREFIX and ED support in all ebuild helpers. This allows our prefix tests to use helpers like insinto, doins, and dosym. --- bin/ebuild-helpers/dosym | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'bin/ebuild-helpers/dosym') diff --git a/bin/ebuild-helpers/dosym b/bin/ebuild-helpers/dosym index 7dd4c6d51..8b7b304ee 100755 --- a/bin/ebuild-helpers/dosym +++ b/bin/ebuild-helpers/dosym @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh @@ -9,16 +9,18 @@ if [[ $# -ne 2 ]] ; then exit 1 fi +case "$EAPI" in 0|1|2) ED=${D} ;; esac + if [[ ${2} == */ ]] || \ - [[ -d ${D}${2} && ! -L ${D}${2} ]] ; then + [[ -d ${ED}${2} && ! -L ${ED}${2} ]] ; then # implicit basename not allowed by PMS (bug #379899) eqawarn "QA Notice: dosym target omits basename: '${2}'" fi destdir=${2%/*} -[[ ! -d ${D}${destdir} ]] && dodir "${destdir}" +[[ ! -d ${ED}${destdir} ]] && dodir "${destdir}" -ln -snf "$1" "${D}$2" +ln -snf "$1" "${ED}$2" ret=$? [[ $ret -ne 0 ]] && helpers_die "${0##*/} failed" exit $ret -- cgit v1.2.3-1-g7c22