From e5738cadf0f00b41bff30041eb9055675dadf5bb Mon Sep 17 00:00:00 2001 From: Mike Gerber Date: Thu, 9 Sep 2021 15:05:01 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix=20getting=20debian=20version?= =?UTF-8?q?=20for=20bullseye?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- check_kernel | 3 +-- check_kernel_test.py | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/check_kernel b/check_kernel index 1965c78..f8dc506 100755 --- a/check_kernel +++ b/check_kernel @@ -70,8 +70,7 @@ def running_kernel_version(): if re.search('Debian', proc_version_): # Remove gcc version first - proc_version_ = re.sub('\(gcc[^(]+\(Debian [^)]+\)\s*\)', '', - proc_version_) + proc_version_ = re.sub('\(gcc.*?\)', '', proc_version_) # Then look for the Debian kernel version m = re.search('(?<=Debian )(\S+)', proc_version_) diff --git a/check_kernel_test.py b/check_kernel_test.py index 65191ad..46d1f72 100644 --- a/check_kernel_test.py +++ b/check_kernel_test.py @@ -57,6 +57,10 @@ class RunningKernelVersionTestCase(unittest.TestCase): self.assertEqual(check_kernel.running_kernel_version(), Version('2.6.32-48squeeze11')) + patch_object(check_kernel, 'proc_version', return_value='Linux version 5.10.0-8-amd64 (debian-kernel@lists.debian.org) (gcc-10 (Debian 10.2.1-6) 10.2.1 20210110, GNU ld (GNU Binutils for Debian) 2.35.2) #1 SMP Debian 5.10.46-4 (2021-08-03)') + self.assertEqual(check_kernel.running_kernel_version(), + Version('5.10.46-4')) + class VersionTestCase(unittest.TestCase): def testStr(self):