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 597341381F3 for ; Sat, 3 Aug 2013 00:38:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EFFCAE0A92; Sat, 3 Aug 2013 00:38:20 +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 7A4C6E0A92 for ; Sat, 3 Aug 2013 00:38:20 +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 8D59B33EC1B for ; Sat, 3 Aug 2013 00:38:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id DEE43E468F for ; Sat, 3 Aug 2013 00:38:16 +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: <1375490231.6c0d165a602f7394b19b26059fd6b11a7a661e80.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/, pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: bin/chpathtool.py pym/_emerge/Binpkg.py X-VCS-Directories: bin/ pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 6c0d165a602f7394b19b26059fd6b11a7a661e80 X-VCS-Branch: master Date: Sat, 3 Aug 2013 00:38:16 +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: b226ef04-ad2c-448f-a7a6-4015f60ecf45 X-Archives-Hash: 10c9183a9c3d2483859472aa268ab799 commit: 6c0d165a602f7394b19b26059fd6b11a7a661e80 Author: Zac Medico gentoo org> AuthorDate: Sat Aug 3 00:35:15 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Aug 3 00:37:11 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=6c0d165a chpathtool.py: portage.util._argparse --- bin/chpathtool.py | 7 ++++--- pym/_emerge/Binpkg.py | 6 ++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/bin/chpathtool.py b/bin/chpathtool.py index a040bab..c35acd1 100755 --- a/bin/chpathtool.py +++ b/bin/chpathtool.py @@ -3,11 +3,12 @@ # Distributed under the terms of the GNU General Public License v2 import io -import optparse import os import stat import sys +from portage.util._argparse import ArgumentParser + CONTENT_ENCODING = "utf_8" FS_ENCODING = "utf_8" @@ -142,8 +143,8 @@ def chpath_inplace_symlink(filename, st, old, new): def main(argv): usage = "%s [options] " % (os.path.basename(argv[0],)) - parser = optparse.OptionParser(usage=usage) - options, args = parser.parse_args(argv[1:]) + parser = ArgumentParser(usage=usage) + options, args = parser.parse_known_args(argv[1:]) if len(args) != 3: parser.error("3 args required, got %s" % (len(args),)) diff --git a/pym/_emerge/Binpkg.py b/pym/_emerge/Binpkg.py index ea8a1ad..36f8516 100644 --- a/pym/_emerge/Binpkg.py +++ b/pym/_emerge/Binpkg.py @@ -1,4 +1,4 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from _emerge.EbuildPhase import EbuildPhase @@ -328,11 +328,13 @@ class Binpkg(CompositeTask): self.wait() return + env = self.settings.environ() + env["PYTHONPATH"] = self.settings["PORTAGE_PYTHONPATH"] chpathtool = SpawnProcess( args=[portage._python_interpreter, os.path.join(self.settings["PORTAGE_BIN_PATH"], "chpathtool.py"), self.settings["D"], self._build_prefix, self.settings["EPREFIX"]], - background=self.background, env=self.settings.environ(), + background=self.background, env=env, scheduler=self.scheduler, logfile=self.settings.get('PORTAGE_LOG_FILE')) self._writemsg_level(">>> Adjusting Prefix to %s\n" % self.settings["EPREFIX"])