[gentoo-commits] proj/portage:master commit in: pym/portage/util/_dyn_libs/

[Zac Medico]

commit:     a47407e864d9a5a43d6f05ef06b46e34ff0e0c24
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 23 17:47:03 2015 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Apr 24 17:51:45 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=a47407e8

LinkageMapElf.rebuild: pass error_leader to varexpand (bug 542796)

Since commit f1c1b8a77eebf7713b32e5f9945690f60f4f46de,
LinkageMapElf.rebuild could produce mysterious "bad substitution"
messages.

Fixes: f1c1b8a77eeb ("Generate soname dependency metadata (bug 282639)")
X-Gentoo-Bug: 542796
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=542796
X-Gentoo-forum-thread: https://forums.gentoo.org/viewtopic-t-1014842.html
Acked-by: Brian Dolbec <dolsen <AT> gentoo.org>

 pym/portage/util/_dyn_libs/LinkageMapELF.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pym/portage/util/_dyn_libs/LinkageMapELF.py 
b/pym/portage/util/_dyn_libs/LinkageMapELF.py
index c44666a..f4d8b5d 100644
--- a/pym/portage/util/_dyn_libs/LinkageMapELF.py
+++ b/pym/portage/util/_dyn_libs/LinkageMapELF.py
@@ -339,7 +339,8 @@ class LinkageMapELF(object):
                        obj = entry.filename
                        soname = entry.soname
                        expand = {"ORIGIN": os.path.dirname(entry.filename)}
-                       path = frozenset(normalize_path(varexpand(x, expand))
+                       path = frozenset(normalize_path(
+                               varexpand(x, expand, error_leader=lambda: "%s: 
" % location))
                                for x in entry.runpaths)
                        path = frozensets.setdefault(path, path)
                        needed = frozenset(entry.needed)