almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

Multilib fix - consider only *.so* libs which are also listed in Provides.

Browse Source
This commit is contained in:
Daniel Mach 2013-03-22 09:40:15 -04:00
parent 14ffefd376
commit 6a68c139c8
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/pypungi/multilib.py
View File

@ -20,13 +20,13 @@ import re
import fnmatch import fnmatch
import pathmatch import pathmatch
#from pypungi import is_package, is_source, is_debug, is_noarch
import pypungi import pypungi
LINE_PATTERN_RE = re.compile(r"^\s*(?P<line>[^#]+)(:?\s+(?P<comment>#.*))?$") LINE_PATTERN_RE = re.compile(r"^\s*(?P<line>[^#]+)(:?\s+(?P<comment>#.*))?$")
RUNTIME_PATTERN_SPLIT_RE = re.compile(r"^\s*(?P<path>[^\s]+)\s+(?P<pattern>[^\s]+)(:?\s+(?P<comment>#.*))?$") RUNTIME_PATTERN_SPLIT_RE = re.compile(r"^\s*(?P<path>[^\s]+)\s+(?P<pattern>[^\s]+)(:?\s+(?P<comment>#.*))?$")
SONAME_PATTERN_RE = re.compile(r"^(.+\.so\.[a-zA-Z0-9_\.]+).*$")
def read_lines(lines): def read_lines(lines):
@ -156,6 +156,13 @@ class RuntimeMultilibMethod(MultilibMethodBase):
if self.is_kernel(po): if self.is_kernel(po):
return False return False
# gather all *.so.* provides from the RPM header
provides = set()
for i in po.provides:
match = SONAME_PATTERN_RE.match(i[0])
if match is not None:
provides.add(match.group(1))
for path in po.returnFileEntries() + po.returnFileEntries("ghost"): for path in po.returnFileEntries() + po.returnFileEntries("ghost"):
dirname, filename = path.rsplit("/", 1) dirname, filename = path.rsplit("/", 1)
dirname = dirname.rstrip("/") dirname = dirname.rstrip("/")
@ -167,7 +174,13 @@ class RuntimeMultilibMethod(MultilibMethodBase):
if file_pattern == "-": if file_pattern == "-":
return True return True
if fnmatch.fnmatch(filename, file_pattern): if fnmatch.fnmatch(filename, file_pattern):
return True if ".so.*" in file_pattern:
if filename in provides:
# return only if the lib is provided in RPM header
# (some libs may be private, hence not exposed in Provides)
return True
else:
return True
return False return False