diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-05-15 04:20:22 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-05-15 04:20:22 +0000 |
| commit | 9a16240744addcd32e18a47db9fae5dbba30a598 (patch) | |
| tree | e2b707ec6e38aaeb7274e732a84336630a61acaf | |
| parent | f37b80c742f24fbfe601b3c04d97549f8d8191fb (diff) | |
| download | portage-9a16240744addcd32e18a47db9fae5dbba30a598.tar.gz portage-9a16240744addcd32e18a47db9fae5dbba30a598.tar.bz2 portage-9a16240744addcd32e18a47db9fae5dbba30a598.zip | |
Add back the rstrip(os.path.sep) which is needed in the case where ROOT=/ (regression from r3356).
svn path=/main/trunk/; revision=3358
| -rw-r--r-- | pym/portage.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pym/portage.py b/pym/portage.py index d3814f294..4cdf52208 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -968,8 +968,10 @@ class config: # backupenv is for calculated incremental variables. self.backupenv = os.environ.copy() - config_root = os.path.normpath(config_root) + os.path.sep - target_root = os.path.normpath(target_root) + os.path.sep + config_root = \ + os.path.normpath(config_root).rstrip(os.path.sep) + os.path.sep + target_root = \ + os.path.normpath(target_root).rstrip(os.path.sep) + os.path.sep for k, v in (("PORTAGE_CONFIGROOT", config_root), ("ROOT", target_root)): |