Skip to content

Commit a0c5310

Browse files
committed
Use platform.version() to check the currently active kernel in
LMDE. In Mint, platform.release() returns the kernel version (which matches the package versions), but in LMDE it returns the ABI version.
1 parent 1883a1e commit a0c5310

File tree

1 file changed

+14
-3
lines changed

1 file changed

+14
-3
lines changed

usr/lib/linuxmint/mintUpdate/mintUpdate.py

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import traceback
2222
import setproctitle
2323
import platform
24+
import re
2425

2526
from kernelwindow import KernelWindow
2627
gi.require_version('Gtk', '3.0')
@@ -461,11 +462,18 @@ def run(self):
461462
for pkg in update.package_names:
462463
if "-image-" in pkg:
463464
try:
464-
kernel_version = platform.release().split("-")[0]
465+
if self.application.is_lmde:
466+
# In Mint, platform.release() returns the kernel version. In LMDE it returns the kernel
467+
# abi version. So for LMDE, parse platform.version() instead.
468+
version_string = platform.version()
469+
kernel_version = re.search(r"(\d+\.\d+\.\d+)", version_string).group(1)
470+
else:
471+
kernel_version = platform.release().split("-")[0]
472+
465473
if update.old_version.startswith(kernel_version):
466474
self.reboot_required = True
467-
except:
468-
print("Warning: Could not assess the current kernel version.")
475+
except Exception as e:
476+
print("Warning: Could not assess the current kernel version: %s" % str(e))
469477
self.reboot_required = True
470478
break
471479
if update.type == "security" and \
@@ -1375,6 +1383,7 @@ def __init__(self):
13751383
self.logger.write("Launching Update Manager")
13761384
self.settings = Gio.Settings(schema_id="com.linuxmint.updates")
13771385

1386+
self.is_lmde = False
13781387
self.app_restart_required = False
13791388
self.show_cinnamon_enabled = False
13801389
self.settings.connect("changed", self._on_settings_changed)
@@ -1667,6 +1676,8 @@ def __init__(self):
16671676
# Only support kernel selection in Linux Mint (not LMDE)
16681677
if not os.path.exists("/usr/share/doc/debian-system-adjustments/copyright"):
16691678
viewSubmenu.append(kernelMenuItem)
1679+
else:
1680+
self.is_lmde = True
16701681
except Exception as e:
16711682
print (e)
16721683
print(sys.exc_info()[0])

0 commit comments

Comments
 (0)