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 03695138334 for ; Thu, 17 Jan 2019 18:30:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 35ABCE09F5; Thu, 17 Jan 2019 18:30:34 +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 12484E09F5 for ; Thu, 17 Jan 2019 18:30:33 +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 67032335CF8 for ; Thu, 17 Jan 2019 18:30:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 26F6744B for ; Thu, 17 Jan 2019 18:30:30 +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: <1547749794.0180b4e4a4499878a01005b317c8cea431bbb5fa.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/ebuild.sh X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 0180b4e4a4499878a01005b317c8cea431bbb5fa X-VCS-Branch: master Date: Thu, 17 Jan 2019 18:30:30 +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: 4c7a0fe2-e4e6-4f0c-b2cf-e59acdfaf911 X-Archives-Hash: 74a2b10d771dee8e62010e18060cc98b commit: 0180b4e4a4499878a01005b317c8cea431bbb5fa Author: junwei <337560754 qq com> AuthorDate: Thu Jan 17 16:06:12 2019 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Jan 17 18:29:54 2019 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=0180b4e4 ebuild.sh: fix try_source qa condition test Fixes: 60ee4deefb70 ("Refactor bashrc scripts sourcing") Closes: https://github.com/gentoo/portage/pull/400 Signed-off-by: Zac Medico gentoo.org> bin/ebuild.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 978643af7..820db50ca 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -476,7 +476,7 @@ __try_source() { # If $- contains x, then tracing has already been enabled # elsewhere for some reason. We preserve it's state so as # not to interfere. - if [[ ${qa} ]]; then + if ! ${qa} ; then source "${1}" else __qa_source "${1}"