summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiro HronĨok <miro@hroncok.cz>2020-06-17 16:11:26 +0200
committerPanu Matilainen <pmatilai@redhat.com>2020-08-31 11:52:07 +0300
commit02e032e61dad1647657d560d07fd551c328a0fbd (patch)
tree84ca90b9b3d27c4ec6590f02eebae1ffbbc85f0d
parentb3b120ffad0e46d03e607122bcd120ae27886b55 (diff)
downloadrpm-02e032e61dad1647657d560d07fd551c328a0fbd.tar.gz
Fix python(abi) requires generator, it picked files from almost good directories
The %__python_magic filter suddenly got actually working with file 5.39: Before: file.cpython-38.opt-1.pyc: data After: file.cpython-38.opt-1.pyc: python 3.8 byte-compiled Hence, the filter started to pick all Python files regardless of their location. Later, in the actual generator, paths like this were considered: /opt/usr/lib/python3.X/... And generated requirements on python(abi). We don't actually need to filter the files by file magic, so we drop it to get the previously accidentally working behavior. We could choose if the path and magic filters are applied as OR or AND. However, we don't want either. We actually want to mach any files in Python directories regardless of their magic. We *could* filter by file type (and executable bit) for provides, but that would require us to split the attr files into two. (cherry picked from commit 8c45b8d80a68cf8e6f864b77e8111e9d070e1d7b)
-rw-r--r--fileattrs/python.attr1
1 files changed, 0 insertions, 1 deletions
diff --git a/fileattrs/python.attr b/fileattrs/python.attr
index 400001996..1793d3cfb 100644
--- a/fileattrs/python.attr
+++ b/fileattrs/python.attr
@@ -25,4 +25,3 @@
}
%__python_path ^((%{_prefix}/lib(64)?/python[[:digit:]]+\\.[[:digit:]]+/.*\\.(py[oc]?|so))|(%{_bindir}/python[[:digit:]]+\\.[[:digit:]]+))$
-%__python_magic [Pp]ython.*(executable|byte-compiled)