Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-PyInstaller for openSUSE:Factory checked in at 2021-04-06 17:29:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-PyInstaller (Old) and /work/SRC/openSUSE:Factory/.python-PyInstaller.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-PyInstaller" Tue Apr 6 17:29:58 2021 rev:4 rq:882590 version:3.6 Changes: -------- --- /work/SRC/openSUSE:Factory/python-PyInstaller/python-PyInstaller.changes 2020-03-18 12:50:28.421141787 +0100 +++ /work/SRC/openSUSE:Factory/.python-PyInstaller.new.2401/python-PyInstaller.changes 2021-04-06 17:31:21.627230910 +0200 @@ -1,0 +2,6 @@ +Thu Apr 1 13:27:23 UTC 2021 - Mark??ta Machov?? <mmach...@suse.com> + +- Automagically skip matplotlib tests because matplotlib dropped python36 +- Add glibc233.patch to fix recent test failure + +------------------------------------------------------------------- New: ---- glibc233.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-PyInstaller.spec ++++++ --- /var/tmp/diff_new_pack.VNsVsL/_old 2021-04-06 17:31:22.139231489 +0200 +++ /var/tmp/diff_new_pack.VNsVsL/_new 2021-04-06 17:31:22.139231489 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-PyInstaller # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,6 +26,8 @@ License: GPL-2.0-only URL: https://www.pyinstaller.org Source: https://files.pythonhosted.org/packages/source/P/PyInstaller/PyInstaller-%{version}.tar.gz +# PATCH-FIX-UPSTREAM https://github.com/pyinstaller/pyinstaller/pull/5547/commits/589819183afc18f2d5b51dbbce68b7aca020c5e8 Bindepend: Skip/warn unrecognised output from ldconfig +Patch0: glibc233.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: fdupes @@ -47,7 +49,6 @@ BuildRequires: %{python_module cryptography} BuildRequires: %{python_module docutils} BuildRequires: %{python_module macholib >= 1.8} -BuildRequires: %{python_module matplotlib} BuildRequires: %{python_module opengl} BuildRequires: %{python_module pefile >= 2017.8.1} BuildRequires: %{python_module psutil} @@ -73,6 +74,7 @@ %prep %setup -q -n PyInstaller-%{version} +%autopatch -p1 chmod a-x PyInstaller/utils/hooks/__init__.py # Force build of bootloader ++++++ glibc233.patch ++++++ >From 589819183afc18f2d5b51dbbce68b7aca020c5e8 Mon Sep 17 00:00:00 2001 From: bwoodsend <bwoods...@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 ++++++++++++ news/5540.bugfix.rst | 3 +++ 2 files changed, 15 insertions(+) create mode 100644 news/5540.bugfix.rst diff --git a/PyInstaller/depend/utils.py b/PyInstaller/depend/utils.py index baffb2a9f3..95846f39d5 100644 --- a/PyInstaller/depend/utils.py +++ b/PyInstaller/depend/utils.py @@ -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
