From 2131c13ab14a4b4583d2915a798d0981b33be198 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 8 Aug 2008 21:37:50 +0000 Subject: In LinkageMap.rebuild(), filter empty strings that may be returned from split calls when processing the "needed" and "path" entries. Thanks to Lucian Poston for reporting. svn path=/main/trunk/; revision=11355 --- pym/portage/dbapi/vartree.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index e59571173..ff3d976b0 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -173,8 +173,10 @@ class LinkageMap(object): arch = fields[0] obj = os.path.realpath(fields[1]) soname = fields[2] - path = fields[3].replace("${ORIGIN}", os.path.dirname(obj)).replace("$ORIGIN", os.path.dirname(obj)).split(":") - needed = fields[4].split(",") + path = filter(None, fields[3].replace( + "${ORIGIN}", os.path.dirname(obj)).replace( + "$ORIGIN", os.path.dirname(obj)).split(":")) + needed = filter(None, fields[4].split(",")) if soname: libs.setdefault(soname, {arch: {"providers": [], "consumers": []}}) libs[soname].setdefault(arch, {"providers": [], "consumers": []}) -- cgit v1.2.3-1-g7c22