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

Add matching multilib method to log

Browse Source 
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2017-01-30 14:27:17 +01:00
parent 08fbdec494
commit 5c1d04eb00
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pungi/gather_dnf.py
View File

@ -714,7 +714,7 @@ class Gather(GatherBase):
multilib_pkgs.append(i) multilib_pkgs.append(i)
added.add(i) added.add(i)
self._set_flag(i, PkgFlag.multilib) self._set_flag(i, PkgFlag.multilib)
self._add_packages([i], reason='multilib') self._add_packages([i], reason='multilib:%s' % is_multilib)
self.finished_add_multilib_packages[pkg] = i self.finished_add_multilib_packages[pkg] = i
# TODO: ^^^ may get multiple results; i686, i586, etc. # TODO: ^^^ may get multiple results; i686, i586, etc.

16
pungi/multilib_dnf.py
View File

@ -25,14 +25,12 @@ RE_SONAME = re.compile(r"^.*\.so\.\d+.*$")
class Multilib(object): class Multilib(object):
def __init__(self, sack, methods, blacklist=None, whitelist=None): def __init__(self, sack, methods, blacklist=None, whitelist=None):
self.sack = sack self.sack = sack
self.methods = [] self.methods = {}
self.blacklist = blacklist or [] self.blacklist = blacklist or []
self.whitelist = whitelist or [] self.whitelist = whitelist or []
for i in methods: for method in methods:
name = "method_%s" % i self.methods[method] = getattr(self, "method_%s" % method)
func = getattr(self, name)
self.methods.append(func)
def _match_one(self, pkg, pattern): def _match_one(self, pkg, pattern):
return fnmatch.fnmatch(pkg.name, pattern) return fnmatch.fnmatch(pkg.name, pattern)
@ -74,8 +72,8 @@ class Multilib(object):
if self._match_any(pkg, self.blacklist): if self._match_any(pkg, self.blacklist):
return False return False
if self._match_any(pkg, self.whitelist): if self._match_any(pkg, self.whitelist):
return True return 'whitelist'
for i in self.methods: for method, func in self.methods.iteritems():
if i(pkg): if func(pkg):
return True return method
return False return False