diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2006-11-04 05:52:09 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-11-04 05:52:09 +0000 |
| commit | e5b7d939ef00d3241bfdf4fc2689100c7c4ab9de (patch) | |
| tree | c97c38cc7c9006e241da6f220c9427776c5a292e | |
| parent | Allow env.d file names with 3 characters. This is a regression from r4451. (t... (diff) | |
| download | portage-multirepo-2.1.1-r2.tar.gz portage-multirepo-2.1.1-r2.tar.bz2 portage-multirepo-2.1.1-r2.zip | |
Filter empty elements in cumulative env-update variables. Thanks to Brian Harring for this patch from bug #151694. (trunk r4741)v2.1.1-r2
svn path=/main/branches/2.1.1/; revision=4933
| -rw-r--r-- | pym/portage.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/portage.py b/pym/portage.py index 7844dc2c..6c67ac11 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -509,7 +509,7 @@ def env_update(makelinks=1, target_root=None, prev_mtimes=None): mylist = [] for myconfig in config_list: if var in myconfig: - mylist.extend(myconfig[var].split()) + mylist.extend(filter(None, myconfig[var].split())) del myconfig[var] # prepare for env.update(myconfig) if mylist: env[var] = " ".join(mylist) @@ -519,7 +519,7 @@ def env_update(makelinks=1, target_root=None, prev_mtimes=None): mylist = [] for myconfig in config_list: if var in myconfig: - mylist.extend(myconfig[var].split(":")) + mylist.extend(filter(None, myconfig[var].split(":"))) del myconfig[var] # prepare for env.update(myconfig) if mylist: env[var] = ":".join(mylist) |