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 CE73C1382C5 for ; Sat, 3 Mar 2018 22:24:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E09B2E09C8; Sat, 3 Mar 2018 22:24:07 +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 BDF9DE09C8 for ; Sat, 3 Mar 2018 22:24:07 +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 70351335C0A for ; Sat, 3 Mar 2018 22:24:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A2A851F1 for ; Sat, 3 Mar 2018 22:24:03 +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: <1520115007.891926ba231380c4aa0768be0aa0ae1ed2bc6ae7.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/package/ebuild/doebuild.py X-VCS-Directories: pym/portage/package/ebuild/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 891926ba231380c4aa0768be0aa0ae1ed2bc6ae7 X-VCS-Branch: master Date: Sat, 3 Mar 2018 22:24:03 +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-Archives-Salt: f2190d91-2e71-4614-8941-348cbe40a149 X-Archives-Hash: 3973b37d4bfcb1b60f996fcdfc17029b commit: 891926ba231380c4aa0768be0aa0ae1ed2bc6ae7 Author: Zac Medico gentoo org> AuthorDate: Sat Mar 3 21:49:26 2018 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Mar 3 22:10:07 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=891926ba _spawn_actionmap: simplify nosandbox logic Remove a nosandbox assignment that never executes, since the condition for the 'if' statement always evaluates to False: nosandbox = ( "userpriv" in features and "usersandbox" not in features and "userpriv" not in restrict and "nouserpriv" not in restrict ) If nosandbox is True, it implies that the following expression is False: ( "userpriv" not in features or "userpriv" in restrict or "nouserpriv" in restrict ) Therefore, the condition for the 'if' statement always evaluates to False. Reported-by: Douglas Freed mtu.edu> pym/portage/package/ebuild/doebuild.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py index 17fc8ccf4..8c8f373bf 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -1354,11 +1354,6 @@ def _spawn_actionmap(settings): ("usersandbox" not in features) and \ "userpriv" not in restrict and \ "nouserpriv" not in restrict) - if nosandbox and ("userpriv" not in features or \ - "userpriv" in restrict or \ - "nouserpriv" in restrict): - nosandbox = ("sandbox" not in features and \ - "usersandbox" not in features) if not portage.process.sandbox_capable: nosandbox = True