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 6F50713838B for ; Thu, 2 Oct 2014 18:47:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 063AFE07F2; Thu, 2 Oct 2014 18:47:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A5A41E07F2 for ; Thu, 2 Oct 2014 18:47:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C987D3403B1 for ; Thu, 2 Oct 2014 18:47:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7DB626C96 for ; Thu, 2 Oct 2014 18:47:30 +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: <1412275641.a0d6d04ad4a5bd52b7ed3639bd71370fe986024d.grobian@gentoo> Subject: [gentoo-commits] proj/portage:prefix commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/portageq X-VCS-Directories: bin/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: a0d6d04ad4a5bd52b7ed3639bd71370fe986024d X-VCS-Branch: prefix Date: Thu, 2 Oct 2014 18:47: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-Archives-Salt: 150a5488-2e47-45b1-8318-e2c166d51ff7 X-Archives-Hash: 624b5c0e26d08610fb9078b428c00d1c commit: a0d6d04ad4a5bd52b7ed3639bd71370fe986024d Author: Fabian Groffen gentoo org> AuthorDate: Thu Oct 2 18:47:21 2014 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Oct 2 18:47:21 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a0d6d04a portageq: fix backtrace due to changed variable --- bin/portageq | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bin/portageq b/bin/portageq index 7b9e177..d383d42 100755 --- a/bin/portageq +++ b/bin/portageq @@ -24,11 +24,13 @@ import os import types # for an explanation on this logic, see pym/_emerge/__init__.py +# this differs from master, we need to revisit this when we can install +# using distutils, like master if os.environ.__contains__("PORTAGE_PYTHONPATH"): - pym_path = os.environ["PORTAGE_PYTHONPATH"] + pym_paths = [ os.environ["PORTAGE_PYTHONPATH"] ] else: - pym_path = os.path.join(os.path.dirname( - os.path.dirname(os.path.realpath(__file__))), "pym") + pym_paths = [ os.path.join(os.path.dirname( + os.path.dirname(os.path.realpath(__file__))), "pym") ] # Avoid sandbox violations after Python upgrade. if os.environ.get("SANDBOX_ON") == "1": sandbox_write = os.environ.get("SANDBOX_WRITE", "").split(":")