almalinux/pungi
15
2
Fork 0
Code Issues Pull Requests Releases Activity

Remove fnmatch from pkg_is_debug

Browse Source 
On Python 2.7 fnmatch is not thread-safe, and this can cause crashes in
nodeps gather source.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2020-03-12 09:11:32 +01:00
parent e70ad8aaa5
commit fb7f7396be
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pungi/util.py
View File

@ -14,7 +14,6 @@
# along with this program; if not, see <https://gnu.org/licenses/>.
import argparse
import fnmatch
import json
import subprocess
import os
@ -37,6 +36,7 @@ from productmd.common import get_major_version
# Patterns that match all names of debuginfo packages
DEBUG_PATTERNS = ["*-debuginfo", "*-debuginfo-*", "*-debugsource"]
DEBUG_PATTERN_RE = re.compile(r".*-debuginfo(?:-.*)?|.*-debuginfo-.*|.*-debugsource")
def _doRunCommand(
@ -223,11 +223,7 @@ def pkg_is_debug(pkg_obj):
else:
name = pkg_obj.name
for pattern in DEBUG_PATTERNS:
if fnmatch.fnmatch(name, pattern):
return True
return False
return DEBUG_PATTERN_RE.match(name)
# fomat: [(variant_uid_regex, {arch|*: [data]})]