[gentoo-commits] proj/portage:master commit in: pym/portage/tests/emerge/, pym/portage/util/

[gentoo-commits] proj/portage:master commit in: pym/portage/tests/emerge/, pym/portage/util/

[Zac Medico]

commit:     4dfa32988cf5b3eeab09e2701e40a4270abe6ceb
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  5 23:16:01 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon Sep  5 23:16:01 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=4dfa3298

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 = (portage_python, "-Wd",
 			os.path.join(PORTAGE_BIN_PATH, "emaint"))
+		env_update_cmd = (portage_python, "-Wd",
+			os.path.join(PORTAGE_BIN_PATH, "env-update"))
 		portageq_cmd = (portage_python, "-Wd",
 			os.path.join(PORTAGE_BIN_PATH, "portageq"))
 		quickpkg_cmd = (portage_python, "-Wd",
@@ -141,6 +143,7 @@ src_install() {
 			egencache_extra_args.append("--update-use-local-desc")
 
 		test_commands = (
+			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=1, target_root=None, prev_mtimes=None, contents=None,
 	if prev_mtimes is None:
 		prev_mtimes = portage.mtimedb["ldpath"]
 	if env is None:
-		settings = os.environ
+		settings = portage.settings
 	else:
 		settings = env