Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bindepend: Skip/warn unrecognised output from ldconfig (#5540). #5547

Merged
merged 1 commit into from Feb 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 12 additions & 0 deletions PyInstaller/depend/utils.py
Expand Up @@ -399,6 +399,18 @@ def load_ldconfig_cache():
for line in text:
# :fixme: this assumes libary names do not contain whitespace
m = pattern.match(line)

# Sanitize away any abnormal lines of output.
if m is None:
# Warn about it then skip the rest of this iteration.
if re.search("Cache generated by:", line):
# See #5540. This particular line is harmless.
pass
else:
logger.warning(
"Unrecognised line of output %r from ldconfig", line)
continue

path = m.groups()[-1]
if is_freebsd or is_openbsd:
# Insert `.so` at the end of the lib's basename. soname
Expand Down
3 changes: 3 additions & 0 deletions news/5540.bugfix.rst
@@ -0,0 +1,3 @@
Linux: Fix binary dependency scanner to support `changes to ldconfig
<https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=dfb3f101c5ef23adf60d389058a2b33e23303d04>`_
introduced in ``glibc`` 2.33.