| 1 |
Since commit f1c1b8a77eebf7713b32e5f9945690f60f4f46de, |
| 2 |
LinkageMapElf.rebuild could produce mysterious "bad substitution" |
| 3 |
messages. |
| 4 |
|
| 5 |
Fixes: f1c1b8a77eeb ("Generate soname dependency metadata (bug 282639)") |
| 6 |
X-Gentoo-Bug: 542796 |
| 7 |
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=542796 |
| 8 |
X-Gentoo-forum-thread: https://forums.gentoo.org/viewtopic-t-1014842.html |
| 9 |
--- |
| 10 |
pym/portage/util/_dyn_libs/LinkageMapELF.py | 3 ++- |
| 11 |
1 file changed, 2 insertions(+), 1 deletion(-) |
| 12 |
|
| 13 |
diff --git a/pym/portage/util/_dyn_libs/LinkageMapELF.py b/pym/portage/util/_dyn_libs/LinkageMapELF.py |
| 14 |
index c44666a..f4d8b5d 100644 |
| 15 |
--- a/pym/portage/util/_dyn_libs/LinkageMapELF.py |
| 16 |
+++ b/pym/portage/util/_dyn_libs/LinkageMapELF.py |
| 17 |
@@ -339,7 +339,8 @@ class LinkageMapELF(object): |
| 18 |
obj = entry.filename |
| 19 |
soname = entry.soname |
| 20 |
expand = {"ORIGIN": os.path.dirname(entry.filename)} |
| 21 |
- path = frozenset(normalize_path(varexpand(x, expand)) |
| 22 |
+ path = frozenset(normalize_path( |
| 23 |
+ varexpand(x, expand, error_leader=lambda: "%s: " % location)) |
| 24 |
for x in entry.runpaths) |
| 25 |
path = frozensets.setdefault(path, path) |
| 26 |
needed = frozenset(entry.needed) |
| 27 |
-- |
| 28 |
2.3.1 |
Archives