From 67c5be9c5364cfe9ee2bd00b337582eb1527b939 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Sun, 12 Jan 2025 13:32:39 +0100 Subject: [PATCH] util: Stop special-casing trySpawnCommandLine() parse errors Unlike for plain JS Errors, the `message` property of GLib.Errors is read-only, so the intent to replace it with a nicer message triggers an Error itself. We could create a new GLib.Error with the changed message instead, but as it turns out, none of the parse errors contain the technical prefix we want to strip out, so we can simply drop the special-casing altogether. This is also consistent with `spawnCommandLine()`, which never had special treatment of parse errors. Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/8146 Part-of: --- js/misc/util.js | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/js/misc/util.js b/js/misc/util.js index 0dbb97b2e..517ff5784 100644 --- a/js/misc/util.js +++ b/js/misc/util.js @@ -160,17 +160,7 @@ export function trySpawn(argv) { * fails, this will throw an error. */ export function trySpawnCommandLine(commandLine) { - let success_, argv; - - try { - [success_, argv] = GLib.shell_parse_argv(commandLine); - } catch (err) { - // Replace "Error invoking GLib.shell_parse_argv: " with - // something nicer - err.message = err.message.replace(/[^:]*: /, `${_('Could not parse command:')}\n`); - throw err; - } - + const [, argv] = GLib.shell_parse_argv(commandLine); trySpawn(argv); }