From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7D91A138247 for ; Sun, 15 Dec 2013 07:56:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3A006E0B51; Sun, 15 Dec 2013 07:56:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D15D6E0B51 for ; Sun, 15 Dec 2013 07:56:34 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0B4E833F4EA for ; Sun, 15 Dec 2013 07:56:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 86879E545E for ; Sun, 15 Dec 2013 07:56:31 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1387094092.d941e02bac17ae1a258d9df6de4d25987dda0b59.grobian@gentoo> Subject: [gentoo-commits] proj/portage:prefix 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: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: d941e02bac17ae1a258d9df6de4d25987dda0b59 X-VCS-Branch: prefix Date: Sun, 15 Dec 2013 07:56:31 +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: a1fb5c29-99e2-444a-9c4a-be58b52bd76d X-Archives-Hash: 5fb6b0387805293e1528bfd482c8e8b4 commit: d941e02bac17ae1a258d9df6de4d25987dda0b59 Author: Benda Xu gentoo org> AuthorDate: Sun Dec 15 07:54:52 2013 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sun Dec 15 07:54:52 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=d941e02b _spawn_actionmap: fix logic such that nosandbox doesn't always evaluate to True --- pym/portage/package/ebuild/doebuild.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py index 691ef97..374cc9a 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -1311,10 +1311,8 @@ def _spawn_actionmap(settings): nosandbox = ("sandbox" not in features and \ "usersandbox" not in features) - if not portage.process.sandbox_capable: - nosandbox = True - - if not portage.process.macossandbox_capable: + if not (portage.process.sandbox_capable or \ + portage.process.macossandbox_capable): nosandbox = True sesandbox = settings.selinux_enabled() and \