diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-09-05 16:16:01 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-09-05 16:16:01 -0700 |
| commit | 4dfa32988cf5b3eeab09e2701e40a4270abe6ceb (patch) | |
| tree | 18f740870d9eea63dd8965abb6f68992c81a9018 /pym | |
| parent | b2607fa29ce49e08b4957babce1fb1204ca5a1ad (diff) | |
| download | portage-4dfa32988cf5b3eeab09e2701e40a4270abe6ceb.tar.gz portage-4dfa32988cf5b3eeab09e2701e40a4270abe6ceb.tar.bz2 portage-4dfa32988cf5b3eeab09e2701e40a4270abe6ceb.zip | |
tests/emerge: test env-update
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/tests/emerge/test_simple.py | 3 | ||||
| -rw-r--r-- | 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 62cb46ceb..a3b730ba4 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 a6c850e2c..19c7666b9 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 |