From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1144007-garchives=archives.gentoo.org@lists.gentoo.org>
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 95B14138350
for <garchives@archives.gentoo.org>; Sat, 8 Feb 2020 18:19:48 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id BD3D3E07AE;
Sat, 8 Feb 2020 18:19:47 +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 9D20CE07AE
for <gentoo-commits@lists.gentoo.org>; Sat, 8 Feb 2020 18:19:47 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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 2CE7134E5EC
for <gentoo-commits@lists.gentoo.org>; Sat, 8 Feb 2020 18:19:46 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id D087C10F
for <gentoo-commits@lists.gentoo.org>; Sat, 8 Feb 2020 18:19:43 +0000 (UTC)
From: "Mike Gilbert" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" <floppym@gentoo.org>
Message-ID: <1581185936.81c88389f0456385545abb1bd703f8c25f009697.floppym@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: bin/
X-VCS-Repository: proj/portage
X-VCS-Files: bin/phase-helpers.sh
X-VCS-Directories: bin/
X-VCS-Committer: floppym
X-VCS-Committer-Name: Mike Gilbert
X-VCS-Revision: 81c88389f0456385545abb1bd703f8c25f009697
X-VCS-Branch: master
Date: Sat, 8 Feb 2020 18:19:43 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: a6af9104-5fe0-4408-9b53-771be1d25b9b
X-Archives-Hash: a8e340fb74c35657ffc5635174f57f7b
commit: 81c88389f0456385545abb1bd703f8c25f009697
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 8 17:47:03 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Feb 8 18:18:56 2020 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=81c88389
phase-helpers.sh: avoid passing an empty root value to portageq
Bug: https://bugs.gentoo.org/708660
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
Reviewed-by: Zac Medico <zmedico <AT> gentoo.org>
bin/phase-helpers.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index 020862ba0..3deb28c68 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -878,7 +878,7 @@ ___best_version_and_has_version_common() {
if ___eapi_has_prefix_variables; then
case ${root_arg} in
-r) root=${ROOT%/}/${EPREFIX#/} ;;
- -d) root=${ESYSROOT} ;;
+ -d) root=${ESYSROOT:-/} ;;
-b)
# Use /${PORTAGE_OVERRIDE_EPREFIX#/} which is equivalent
# to BROOT, except BROOT is only defined in src_* phases.
@@ -888,8 +888,8 @@ ___best_version_and_has_version_common() {
esac
else
case ${root_arg} in
- -r) root=${ROOT} ;;
- -d) root=${SYSROOT} ;;
+ -r) root=${ROOT:-/} ;;
+ -d) root=${SYSROOT:-/} ;;
-b) root=/ ;;
esac
fi ;;