tests/emerge: test env-update

diff --git a/pym/portage/tests/emerge/test_simple.py b/pym/portage/tests/emerge/test_simple.py
index 62cb46cebd57d33feb6fe2e770c332ff3fd2076c..a3b730ba4d91d558b1671f7a56b4fb2e6bfde1e1 100644 (file)
--- 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 a6c850e2cb0fbdef033759f4749558c038caa35b..19c7666b99539afda555b2bfcc8a46163d2f114d 100644 (file)
--- 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