| 1 |
commit: 4dfa32988cf5b3eeab09e2701e40a4270abe6ceb |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 5 23:16:01 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 5 23:16:01 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=4dfa3298 |
| 7 |
|
| 8 |
tests/emerge: test env-update |
| 9 |
|
| 10 |
--- |
| 11 |
pym/portage/tests/emerge/test_simple.py | 3 +++ |
| 12 |
pym/portage/util/env_update.py | 2 +- |
| 13 |
2 files changed, 4 insertions(+), 1 deletions(-) |
| 14 |
|
| 15 |
diff --git a/pym/portage/tests/emerge/test_simple.py b/pym/portage/tests/emerge/test_simple.py |
| 16 |
index 62cb46c..a3b730b 100644 |
| 17 |
--- a/pym/portage/tests/emerge/test_simple.py |
| 18 |
+++ b/pym/portage/tests/emerge/test_simple.py |
| 19 |
@@ -131,6 +131,8 @@ src_install() { |
| 20 |
os.path.join(PORTAGE_BIN_PATH, "emerge")) |
| 21 |
emaint_cmd = (portage_python, "-Wd", |
| 22 |
os.path.join(PORTAGE_BIN_PATH, "emaint")) |
| 23 |
+ env_update_cmd = (portage_python, "-Wd", |
| 24 |
+ os.path.join(PORTAGE_BIN_PATH, "env-update")) |
| 25 |
portageq_cmd = (portage_python, "-Wd", |
| 26 |
os.path.join(PORTAGE_BIN_PATH, "portageq")) |
| 27 |
quickpkg_cmd = (portage_python, "-Wd", |
| 28 |
@@ -141,6 +143,7 @@ src_install() { |
| 29 |
egencache_extra_args.append("--update-use-local-desc") |
| 30 |
|
| 31 |
test_commands = ( |
| 32 |
+ env_update_cmd, |
| 33 |
egencache_cmd + ("--update",) + tuple(egencache_extra_args), |
| 34 |
emerge_cmd + ("--version",), |
| 35 |
emerge_cmd + ("--info",), |
| 36 |
|
| 37 |
diff --git a/pym/portage/util/env_update.py b/pym/portage/util/env_update.py |
| 38 |
index a6c850e..19c7666 100644 |
| 39 |
--- a/pym/portage/util/env_update.py |
| 40 |
+++ b/pym/portage/util/env_update.py |
| 41 |
@@ -46,7 +46,7 @@ def env_update(makelinks=1, target_root=None, prev_mtimes=None, contents=None, |
| 42 |
if prev_mtimes is None: |
| 43 |
prev_mtimes = portage.mtimedb["ldpath"] |
| 44 |
if env is None: |
| 45 |
- settings = os.environ |
| 46 |
+ settings = portage.settings |
| 47 |
else: |
| 48 |
settings = env |
Archives