aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-02-04 01:15:36 +0000
committerZac Medico <zmedico@gentoo.org>2006-02-04 01:15:36 +0000
commit8ab6b8c6968f00decb50b7ed6ae2b99308818ad9 (patch)
tree854189965bd30342101b348cdb5d66316b7a7045
parentadd some more DepSet test input (diff)
downloadportage-savior.tar.gz
portage-savior.tar.bz2
portage-savior.zip
fix ebuild/profiles.py so that it won't try to split() USE_EXPAND unless it is a stringsavior
svn path=/main/branches/savior/; revision=2647
-rw-r--r--portage/ebuild/profiles.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/portage/ebuild/profiles.py b/portage/ebuild/profiles.py
index d86ff1def..453c666d0 100644
--- a/portage/ebuild/profiles.py
+++ b/portage/ebuild/profiles.py
@@ -129,9 +129,9 @@ class OnDiskProfile(profiles.base):
else: d[k] = v
else: d[k] = v
-
- # use_expand
- d["USE_EXPAND"] = d.get("USE_EXPAND",'').split()
+ d.setdefault("USE_EXPAND",'')
+ if isinstance(d["USE_EXPAND"],str):
+ d["USE_EXPAND"] = d["USE_EXPAND"].split()
for u in d["USE_EXPAND"]:
u2 = u.lower()+"_"
if u in d: