From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 25 Feb 2023 12:16:42 +0000 (+0000)
Subject: keymaps: Refactor how we ignore any errors
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c44990c4d1302147c88735a723f96db9b6f90f52;p=people%2Fms%2Fbricklayer.git

keymaps: Refactor how we ignore any errors

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/python/keymaps.py b/src/python/keymaps.py
index 13950db..aec7da5 100644
--- a/src/python/keymaps.py
+++ b/src/python/keymaps.py
@@ -19,7 +19,6 @@
 ###############################################################################
 
 import logging
-import subprocess
 
 from . import step
 from .i18n import _
@@ -32,16 +31,15 @@ class SelectKeymap(step.InteractiveStep):
 
 	def run(self):
 		# Get a list of all available keymaps
-		try:
-			keymaps = self.bricklayer.command(["localectl", "list-keymaps"])
+		keymaps = self.bricklayer.command(["localectl", "list-keymaps"], error_ok=True)
 
-			# Split the output by line
-			keymaps = { km : km for km in keymaps.splitlines() }
-
-		# Silently skip this step if no keymaps could be loaded
-		except subprocess.CalledProcessError:
+		# Skip this step if no keymaps could be loaded
+		if not keymaps:
 			return
 
+		# Split the output by line
+		keymaps = { km : km for km in keymaps.splitlines() }
+
 		# Which keymap is currently selected?
 		keymap = self.bricklayer.settings.get("keymap")