From a906838123421c0fa19429db65f5c9fc00083293 Mon Sep 17 00:00:00 2001 From: NiLuJe Date: Sun, 21 Jan 2024 00:52:17 +0100 Subject: [PATCH] Terminal: Clearer error message on prereq failures Pluginloader uses pcall, so, throw with an actual error message Re: #11394 --- plugins/terminal.koplugin/main.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/terminal.koplugin/main.lua b/plugins/terminal.koplugin/main.lua index fbe614f2c..ce2891609 100644 --- a/plugins/terminal.koplugin/main.lua +++ b/plugins/terminal.koplugin/main.lua @@ -36,19 +36,19 @@ local function check_prerequisites() local ptmx = C.open("/dev/ptmx", bit.bor(C.O_RDWR, C.O_NONBLOCK, C.O_CLOEXEC)) if ptmx == -1 then - logger.warn("Terminal: can not open /dev/ptmx:", ffi.string(C.strerror(ffi.errno()))) - return false + logger.warn("Terminal: cannot open /dev/ptmx:", ffi.string(C.strerror(ffi.errno()))) + error("Device doesn't meet some of the plugin's prerequisites") end if C.grantpt(ptmx) ~= 0 then - logger.warn("Terminal: can not grantpt:", ffi.string(C.strerror(ffi.errno()))) + logger.warn("Terminal: cannot use grantpt:", ffi.string(C.strerror(ffi.errno()))) C.close(ptmx) - return false + error("Device doesn't meet some of the plugin's prerequisites") end if C.unlockpt(ptmx) ~= 0 then - logger.warn("Terminal: can not unlockpt:", ffi.string(C.strerror(ffi.errno()))) + logger.warn("Terminal: cannot use unlockpt:", ffi.string(C.strerror(ffi.errno()))) C.close(ptmx) - return false + error("Device doesn't meet some of the plugin's prerequisites") end C.close(ptmx) return true