From 09669fd828812599cbb8f8ef18be73c34d7c90ca Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Tue, 3 Jun 2008 20:45:01 +0000 Subject: [PATCH] minimal cosmetics svn path=/main/branches/prefix/; revision=10562 --- pym/portage/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 4ac632c68..35ebca987 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -1310,7 +1310,7 @@ class config(object): # lead to unexpected results. expand_map = {} - env_d = getconfig(os.path.join(target_root + EPREFIX_LSTRIP, "etc", "profile.env"), + env_d = getconfig(os.path.join(target_root, EPREFIX_LSTRIP, "etc", "profile.env"), expand=expand_map) # env_d will be None if profile.env doesn't exist. if env_d: @@ -1401,7 +1401,8 @@ class config(object): # Blacklist vars that could interfere with portage internals. for blacklisted in "CATEGORY", "EBUILD_PHASE", \ "PKGUSE", "PORTAGE_CONFIGROOT", \ - "PORTAGE_IUSE", "PORTAGE_USE", "ROOT", "EPREFIX", "EROOT": + "PORTAGE_IUSE", "PORTAGE_USE", "ROOT", + "EPREFIX", "EROOT": for cfg in self.lookuplist: cfg.pop(blacklisted, None) del blacklisted, cfg -- 2.26.2