From f75ffe7490dbbc55a2f0421a28f0f66f7555b507 Mon Sep 17 00:00:00 2001 From: Marcin Bojara Date: Wed, 15 Apr 2020 00:52:04 +0200 Subject: [PATCH] try to build as much as possible --- hardware/misc/dkms/comar/pakhandler.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/hardware/misc/dkms/comar/pakhandler.py b/hardware/misc/dkms/comar/pakhandler.py index b014273596..e6684cfc1c 100644 --- a/hardware/misc/dkms/comar/pakhandler.py +++ b/hardware/misc/dkms/comar/pakhandler.py @@ -6,6 +6,8 @@ import re import piksemel import subprocess +raise_install = [] + class BuildModuleError(Exception): pass @@ -24,7 +26,7 @@ def run_dkms(action, name, version, kver, arch): os.system("PATH='/usr/sbin:/usr/bin:/sbin:/bin' dkms %s -m %s -v %s -k %s -a %s" % (action, name, version, kver, arch)) if action == "install" and os.path.exists("/var/lib/dkms/%s/%s/build/make.log" % (name, version)): - raise BuildModuleError("check /var/lib/dkms/%s/%s/build/make.log" % (name, version)) + raise_install.append("check /var/lib/dkms/%s/%s/build/make.log" % (name, version)) def check_dkms(metapath, filepath, action): if piksemel.parse(metapath).getTag("Package").getTagData("Name") == "kernel-module-headers": @@ -36,6 +38,8 @@ def check_dkms(metapath, filepath, action): m = re.match(r"(?P[^\/]+)-(?P[^-]+)", d).groupdict() run_dkms(action, m["name"], m["version"], kver, arch) generate_initrd(kver) + if raise_install: + raise BuildModuleError("\n\t".join(raise_install)) return parse = piksemel.parse(filepath) @@ -47,6 +51,8 @@ def check_dkms(metapath, filepath, action): kver = get_kver() arch = piksemel.parse(metapath).getTag("Package").getTagData("Architecture").replace("_", "-") run_dkms(action, m["name"], m["version"], kver, arch) + if raise_install: + raise BuildModuleError(raise_install.pop()) generate_initrd(kver) return