From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SDNaE-0005Ih-LD for garchives@archives.gentoo.org; Thu, 29 Mar 2012 22:12:43 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C2CA3E0C14; Thu, 29 Mar 2012 22:12:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 906FCE0C14 for ; Thu, 29 Mar 2012 22:12:15 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 04FA01B400E for ; Thu, 29 Mar 2012 22:12:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C3549E5402 for ; Thu, 29 Mar 2012 22:12:13 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1333059101.3ff6c0d01a074169b8afeddc668191541f5e4330.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ebuild-helpers/ X-VCS-Repository: proj/portage X-VCS-Files: bin/ebuild-helpers/dosym X-VCS-Directories: bin/ebuild-helpers/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 3ff6c0d01a074169b8afeddc668191541f5e4330 X-VCS-Branch: master Date: Thu, 29 Mar 2012 22:12:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 8265b11b-e1c5-48b6-bb8e-fca10359ef87 X-Archives-Hash: 607259b11a1b226bc98f3400f359035e commit: 3ff6c0d01a074169b8afeddc668191541f5e4330 Author: Jeremy Olexa gentoo org> AuthorDate: Thu Mar 29 22:02:56 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Mar 29 22:11:41 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D3ff6c0d0 dosym: add $EPREFIX to absolute target --- bin/ebuild-helpers/dosym | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bin/ebuild-helpers/dosym b/bin/ebuild-helpers/dosym index 5e41ec4..2489e22 100755 --- a/bin/ebuild-helpers/dosym +++ b/bin/ebuild-helpers/dosym @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 =20 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh @@ -20,8 +20,11 @@ fi =20 destdir=3D${2%/*} [[ ! -d ${ED}${destdir} ]] && dodir "${destdir}" +# when absolute, prefix with offset for Gentoo Prefix +target=3D"${1}" +[[ ${target:0:1} =3D=3D "/" ]] && target=3D"${EPREFIX}${target}" +ln -snf "${target}" "${ED}${2}" =20 -ln -snf "$1" "${ED}$2" ret=3D$? [[ $ret -ne 0 ]] && helpers_die "${0##*/} failed" exit $ret