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

Remove hardcoded blacklists and whitelists from multilib_dnf.

Browse Source 
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Daniel Mach 2016-06-20 08:43:43 -04:00 committed by Lubomír Sedlář
parent 26cac77639
commit 22a6291c8a
1 changed files with 2 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
pungi/multilib_dnf.py
View File

@ -20,45 +20,7 @@ import re
import fnmatch import fnmatch
DEVEL_BLACKLIST = [ RE_SONAME = re.compile(r"^.*\.so\.\d+.*$")
"dmraid-devel",
"ghc-*",
"java-*-gcj-devel",
"java-*-icedtea-devel",
"java-*-openjdk-devel",
"kdeutils-devel",
"kernel-devel",
"mkinitrd-devel",
"php-devel",
]
DEVEL_WHITELIST = [
"glibc-static",
"libstdc++-static",
]
RUNTIME_BLACKLIST = [
"gcc",
"kernel",
"tomcat-native",
]
RUNTIME_WHITELIST = [
"glibc-static",
"libflashsupport",
"libgnat",
"lmms-vst",
"nspluginwrapper",
"perl-libs",
"redhat-lsb",
"valgrind",
"wine",
"wine-arts",
"yaboot",
]
class Multilib(object): class Multilib(object):
@ -67,7 +29,6 @@ class Multilib(object):
self.methods = [] self.methods = []
self.blacklist = blacklist or [] self.blacklist = blacklist or []
self.whitelist = whitelist or [] self.whitelist = whitelist or []
self.use_default_blacklists = True # use *_BLACKLIST and *_WHITELIST lists
for i in methods: for i in methods:
name = "method_%s" % i name = "method_%s" % i
@ -90,11 +51,6 @@ class Multilib(object):
return True return True
def method_devel(self, pkg): def method_devel(self, pkg):
if self.use_default_blacklists:
if self._match_any(pkg, DEVEL_BLACKLIST):
return False
if self._match_any(pkg, DEVEL_WHITELIST):
return True
if pkg.name.endswith("-devel"): if pkg.name.endswith("-devel"):
return True return True
if pkg.name.endswith("-static"): if pkg.name.endswith("-static"):
@ -109,15 +65,9 @@ class Multilib(object):
return False return False
def method_runtime(self, pkg): def method_runtime(self, pkg):
if self.use_default_blacklists:
if self._match_any(pkg, RUNTIME_BLACKLIST):
return False
if self._match_any(pkg, RUNTIME_WHITELIST):
return True
so = re.compile(r"^.*\.so\.\d+.*$")
for prov in pkg.provides: for prov in pkg.provides:
prov = str(prov) prov = str(prov)
if so.match(prov): if RE_SONAME.match(prov):
return True return True
return False return False