From 35611a7886acd655e61fef90659c6d8931483625 Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Wed, 3 Nov 2010 16:44:39 +0300 Subject: [PATCH] Fix kernel detect. --- pym/cl_fill_builder.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pym/cl_fill_builder.py b/pym/cl_fill_builder.py index 80517e6..3008787 100644 --- a/pym/cl_fill_builder.py +++ b/pym/cl_fill_builder.py @@ -185,7 +185,7 @@ class fillVars(object, varsShare): def get_cl_builder_initrd_install(self): kernelname = self.Get('cl_builder_kernel') reShortname = re.compile( - r"^vmlinuz-(\d+\.)*\d-(x86_64|i686)-(.*)$",re.S) + r"^vmlinuz-(\d+\.)*\d+-(x86_64|i686)-(.*)$",re.S) res = reShortname.search(kernelname) if res: shortname = res.groups()[2] @@ -202,7 +202,7 @@ class fillVars(object, varsShare): def get_cl_builder_kernel_config(self): kernelname = self.Get('cl_builder_kernel') reShortname = re.compile( - r"^vmlinuz-((?:\d+\.)*\d)-(x86_64|i686)-(.*)$",re.S) + r"^vmlinuz-((?:\d+\.)*\d+)-(x86_64|i686)-(.*)$",re.S) res = reShortname.search(kernelname) bootPath = path.join(self.Get('cl_builder_path'),'boot') if res: @@ -219,7 +219,7 @@ class fillVars(object, varsShare): def get_cl_builder_kernel_systemmap(self): kernelname = self.Get('cl_builder_kernel') reShortname = re.compile( - r"^vmlinuz-((?:\d+\.)*\d)-(x86_64|i686)-(.*)$",re.S) + r"^vmlinuz-((?:\d+\.)*\d+)-(x86_64|i686)-(.*)$",re.S) res = reShortname.search(kernelname) bootPath = path.join(self.Get('cl_builder_path'),'boot') if res: