forked from pool/python-PyInstaller
- Remove glibc233.patch (included upstream)
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-PyInstaller?expand=0&rev=16
This commit is contained in:
@@ -1,39 +0,0 @@
|
||||
From 589819183afc18f2d5b51dbbce68b7aca020c5e8 Mon Sep 17 00:00:00 2001
|
||||
From: bwoodsend <bwoodsend@gmail.com>
|
||||
Date: Wed, 10 Feb 2021 19:53:28 +0000
|
||||
Subject: [PATCH] Bindepend: Skip/warn unrecognised output from ldconfig
|
||||
(#5540). [skip-ci]
|
||||
|
||||
ldconfig has started adding additional lines of output such as:
|
||||
|
||||
Cache generated by: ldconfig (GNU libc) release release version 2.33
|
||||
|
||||
which caused regex parse errors. This particular line is now whitelisted
|
||||
as skipable. And any future unrecognised patterns will now issue
|
||||
warnings.
|
||||
---
|
||||
PyInstaller/depend/utils.py | 12 ++++++++++++
|
||||
1 file changed, 12 insertions(+)
|
||||
create mode 100644 news/5540.bugfix.rst
|
||||
|
||||
--- a/PyInstaller/depend/utils.py
|
||||
+++ b/PyInstaller/depend/utils.py
|
||||
@@ -397,6 +397,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
|
@@ -3,7 +3,7 @@ Thu Sep 16 11:25:16 UTC 2021 - Matej Cepl <mcepl@suse.com>
|
||||
|
||||
- Update to 4.5.1: large number of changes, see packaged CHANGES.rst for
|
||||
the complete list.
|
||||
- Update glibc233.patch
|
||||
- Remove glibc233.patch (included upstream)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 1 13:27:23 UTC 2021 - Markéta Machová <mmachova@suse.com>
|
||||
|
@@ -27,9 +27,6 @@ Summary: Bundle a Python application and all its dependencies into a sing
|
||||
License: GPL-2.0-only
|
||||
URL: https://www.pyinstaller.org
|
||||
Source: https://github.com/pyinstaller/%{modname}/archive/refs/tags/v%{version}.tar.gz#/%{modname}-%{version}.tar.gz
|
||||
# PATCH-FIX-UPSTREAM glibc233.patch gh#pyinstaller/pyinstaller#5540 mcepl@suse.com
|
||||
# Skip/warn unrecognised output from ldconfig
|
||||
Patch0: glibc233.patch
|
||||
BuildRequires: %{python_module devel}
|
||||
BuildRequires: %{python_module setuptools}
|
||||
BuildRequires: fdupes
|
||||
|
Reference in New Issue
Block a user