From a0026cb6a3f4da7047875f7a7f49e9b161dd9ea4 Mon Sep 17 00:00:00 2001 From: Marcin Bojara Date: Thu, 9 Jan 2020 12:17:37 +0100 Subject: [PATCH] dkms: fix get module name and version --- hardware/misc/dkms/comar/pakhandler.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/hardware/misc/dkms/comar/pakhandler.py b/hardware/misc/dkms/comar/pakhandler.py index 2d0012f119..0eeec8a3fd 100644 --- a/hardware/misc/dkms/comar/pakhandler.py +++ b/hardware/misc/dkms/comar/pakhandler.py @@ -2,6 +2,7 @@ # -*- coding: utf-8 -*- import os +import re import piksemel import subprocess @@ -32,9 +33,8 @@ def check_dkms(metapath, filepath, action): # rebuild if /usr/src/*/dkms.conf exists for d in os.walk("/usr/src").next()[1]: if os.path.isfile("/usr/src/%s/dkms.conf" % d): - name = d.split("-")[0] - version = d.split("-")[-1] - run_dkms(action, name, version, kver, arch) + m = re.match(r".*\/(?P[^\/]+)-(?P[^-]+)\/[^\/]+", path).groupdict() + run_dkms(action, m["name"], m["version"], kver, arch) generate_initrd(kver) return @@ -43,11 +43,10 @@ def check_dkms(metapath, filepath, action): path = fp.getTagData("Path") # build if package has /usr/src/*/dkms.conf if path.endswith("/dkms.conf") and path.startswith("usr/src/"): - name = path.split("/")[-2].split("-")[0] - version = path.split("/")[-2].split("-")[-1] + m = re.match(r".*\/(?P[^\/]+)-(?P[^-]+)\/[^\/]+", path).groupdict() kver = get_kver() arch = piksemel.parse(metapath).getTag("Package").getTagData("Architecture").replace("_", "-") - run_dkms(action, name, version, kver, arch) + run_dkms(action, m["name"], m["version"], kver, arch) generate_initrd(kver) return