From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1R0iOw-0000gU-ST for garchives@archives.gentoo.org; Mon, 05 Sep 2011 23:16:27 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E879A21C076; Mon, 5 Sep 2011 23:16:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B36DA21C076 for ; Mon, 5 Sep 2011 23:16:18 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E5DB71B4018 for ; Mon, 5 Sep 2011 23:16:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 526FC80042 for ; Mon, 5 Sep 2011 23:16:17 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <4dfa32988cf5b3eeab09e2701e40a4270abe6ceb.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/tests/emerge/, pym/portage/util/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/tests/emerge/test_simple.py pym/portage/util/env_update.py X-VCS-Directories: pym/portage/tests/emerge/ pym/portage/util/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 4dfa32988cf5b3eeab09e2701e40a4270abe6ceb Date: Mon, 5 Sep 2011 23:16:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 4c3eda06e6ec260600d6b38c996b685e commit: 4dfa32988cf5b3eeab09e2701e40a4270abe6ceb Author: Zac Medico gentoo org> AuthorDate: Mon Sep 5 23:16:01 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Sep 5 23:16:01 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D4dfa3298 tests/emerge: test env-update --- pym/portage/tests/emerge/test_simple.py | 3 +++ pym/portage/util/env_update.py | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/pym/portage/tests/emerge/test_simple.py b/pym/portage/tests/= emerge/test_simple.py index 62cb46c..a3b730b 100644 --- a/pym/portage/tests/emerge/test_simple.py +++ b/pym/portage/tests/emerge/test_simple.py @@ -131,6 +131,8 @@ src_install() { os.path.join(PORTAGE_BIN_PATH, "emerge")) emaint_cmd =3D (portage_python, "-Wd", os.path.join(PORTAGE_BIN_PATH, "emaint")) + env_update_cmd =3D (portage_python, "-Wd", + os.path.join(PORTAGE_BIN_PATH, "env-update")) portageq_cmd =3D (portage_python, "-Wd", os.path.join(PORTAGE_BIN_PATH, "portageq")) quickpkg_cmd =3D (portage_python, "-Wd", @@ -141,6 +143,7 @@ src_install() { egencache_extra_args.append("--update-use-local-desc") =20 test_commands =3D ( + env_update_cmd, egencache_cmd + ("--update",) + tuple(egencache_extra_args), emerge_cmd + ("--version",), emerge_cmd + ("--info",), diff --git a/pym/portage/util/env_update.py b/pym/portage/util/env_update= .py index a6c850e..19c7666 100644 --- a/pym/portage/util/env_update.py +++ b/pym/portage/util/env_update.py @@ -46,7 +46,7 @@ def env_update(makelinks=3D1, target_root=3DNone, prev_= mtimes=3DNone, contents=3DNone, if prev_mtimes is None: prev_mtimes =3D portage.mtimedb["ldpath"] if env is None: - settings =3D os.environ + settings =3D portage.settings else: settings =3D env =20