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