| 1 |
commit: 31afcd8307f623e8a454ae5029b3599420f5440c |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 30 00:25:42 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 30 00:25:42 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=31afcd83 |
| 7 |
|
| 8 |
env_update: lstrip os.sep in join with eprefix |
| 9 |
|
| 10 |
--- |
| 11 |
pym/portage/util/env_update.py | 3 ++- |
| 12 |
1 files changed, 2 insertions(+), 1 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/portage/util/env_update.py b/pym/portage/util/env_update.py |
| 15 |
index 1435932..7879ed9 100644 |
| 16 |
--- a/pym/portage/util/env_update.py |
| 17 |
+++ b/pym/portage/util/env_update.py |
| 18 |
@@ -51,7 +51,8 @@ def env_update(makelinks=1, target_root=None, prev_mtimes=None, contents=None, |
| 19 |
target_eroot = portage.settings['EROOT'] |
| 20 |
else: |
| 21 |
eprefix = os.environ.get("__PORTAGE_TEST_EPREFIX", "") |
| 22 |
- target_eroot = os.path.join(target_root, eprefix) |
| 23 |
+ target_eroot = os.path.join(target_root, |
| 24 |
+ eprefix.lstrip(os.sep)) |
| 25 |
target_eroot = target_eroot.rstrip(os.sep) + os.sep |
| 26 |
if hasattr(portage, "db") and target_eroot in portage.db: |
| 27 |
vardbapi = portage.db[target_eroot]["vartree"].dbapi |
Archives