From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1399749-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id DF6FA158090
for <garchives@archives.gentoo.org>; Sun, 22 May 2022 14:51:31 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id CEE3CE092F;
Sun, 22 May 2022 14:51:29 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id E8F9DE092F
for <gentoo-commits@lists.gentoo.org>; Sun, 22 May 2022 14:51:28 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 1B879341D83
for <gentoo-commits@lists.gentoo.org>; Sun, 22 May 2022 14:51:27 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id E99193C3
for <gentoo-commits@lists.gentoo.org>; Sun, 22 May 2022 14:51:24 +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: <1653231046.110f999894f2dfef4b5d9aff9cc999c1cf0d1283.floppym@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: bin/
X-VCS-Repository: proj/portage
X-VCS-Files: bin/ebuild.sh bin/phase-functions.sh
X-VCS-Directories: bin/
X-VCS-Committer: floppym
X-VCS-Committer-Name: Mike Gilbert
X-VCS-Revision: 110f999894f2dfef4b5d9aff9cc999c1cf0d1283
X-VCS-Branch: master
Date: Sun, 22 May 2022 14:51:24 +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: c6775475-31a6-411a-a355-cda0ecda69ae
X-Archives-Hash: 800160ab56be21ca12bb4c6dd8e1f0d9
commit: 110f999894f2dfef4b5d9aff9cc999c1cf0d1283
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Mon May 9 16:35:08 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun May 22 14:50:46 2022 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=110f9998
bin/*.sh: pull logical operators into extended-test bultin expression
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
bin/ebuild.sh | 2 +-
bin/phase-functions.sh | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 056372283..dbadd7919 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -556,7 +556,7 @@ if ! has "$EBUILD_PHASE" clean cleanrm depend && \
y="PORTAGE_${x}"
if [[ -z "${!x}" ]]; then
export ${x}="${!y}"
- elif [[ -n "${!y}" ]] && [[ "${!y}" != "${!x}" ]]; then
+ elif [[ -n "${!y}" && "${!y}" != "${!x}" ]]; then
# filter out dupes
export ${x}="$(printf "${!y}:${!x}" | tr ":" "\0" | \
sort -z -u | tr "\0" ":")"
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index 5aba2519c..0a36af297 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -988,7 +988,7 @@ __ebuild_main() {
ewarn "pkg_${1}() is not defined: '${EBUILD##*/}'"
fi
export SANDBOX_ON="0"
- if [[ "${PORTAGE_DEBUG}" != "1" ]] || [[ "${-/x/}" != "$-" ]]; then
+ if [[ "${PORTAGE_DEBUG}" != "1" || "${-/x/}" != "$-" ]]; then
__ebuild_phase_with_hooks pkg_${1}
else
set -x
@@ -1055,7 +1055,7 @@ __ebuild_main() {
;;
esac
- if [[ "${PORTAGE_DEBUG}" != "1" ]] || [[ "${-/x/}" != "$-" ]]; then
+ if [[ "${PORTAGE_DEBUG}" != "1" || "${-/x/}" != "$-" ]]; then
__dyn_${1}
else
set -x
@@ -1069,7 +1069,7 @@ __ebuild_main() {
#for example, awking and piping a file in /tmp requires a temp file to be created
#in /etc. If pkg_setup is in the sandbox, both our lilo and apache ebuilds break.
export SANDBOX_ON="0"
- if [[ "${PORTAGE_DEBUG}" != "1" ]] || [[ "${-/x/}" != "$-" ]]; then
+ if [[ "${PORTAGE_DEBUG}" != "1" || "${-/x/}" != "$-" ]]; then
__dyn_${1}
else
set -x