From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 45D65138350 for ; Thu, 23 Jan 2020 05:59:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7D4BBE0809; Thu, 23 Jan 2020 05:59:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5D319E0809 for ; Thu, 23 Jan 2020 05:59:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0E9A534E3C7 for ; Thu, 23 Jan 2020 05:58:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 73D8F35 for ; Thu, 23 Jan 2020 05:58:57 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1579759084.dfeae52bdb90763b9144cbb6a82ffc3b8b49d0f6.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: dfeae52bdb90763b9144cbb6a82ffc3b8b49d0f6 X-VCS-Branch: master Date: Thu, 23 Jan 2020 05:58:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f905bdc0-e8d5-4083-8d8a-f453b4e45e9b X-Archives-Hash: ad6b9de8a9f6c19596a4b3e590e22573 commit: dfeae52bdb90763b9144cbb6a82ffc3b8b49d0f6 Author: Zac Medico gentoo org> AuthorDate: Sun Jan 19 18:40:56 2020 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Jan 23 05:58:04 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=dfeae52b dosym: revert deprecated prefix compat (bug 615594) According to PMS, dosym callers need to explicitly prefix the first argument with ${EPREFIX} if that's desired. https://bugs.gentoo.org/615594 Signed-off-by: Zac Medico gentoo.org> bin/ebuild-helpers/dosym | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/bin/ebuild-helpers/dosym b/bin/ebuild-helpers/dosym index d5a651bf5..abd4da4f0 100755 --- a/bin/ebuild-helpers/dosym +++ b/bin/ebuild-helpers/dosym @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1 @@ -20,16 +20,7 @@ fi destdir=${2%/*} [[ ! -d ${ED%/}/${destdir#/} ]] && dodir "${destdir}" -target="${1}" -# DEPRECATED HACK: when absolute, prefix with offset for Gentoo Prefix -# (but only if ${EPREFIX} is not there already) -# this will eventually be removed, #615594 -if [[ ${target:0:1} == "/" && ${target}/ != "${EPREFIX}"/* ]]; then - eqawarn "dosym: prepending EPREFIX to path implicitly. If this is desired," - eqawarn " please fix the ebuild to use \${EPREFIX} explicitly." - target="${EPREFIX}${target}" -fi -ln -snf "${target}" "${ED%/}/${2#/}" +ln -snf "${1}" "${ED%/}/${2#/}" ret=$? [[ $ret -ne 0 ]] && __helpers_die "${0##*/} failed"