From 9cfac7ac2aa2a3f15ac79f770c46c1b1a47dd16b Mon Sep 17 00:00:00 2001 From: deeplow Date: Mon, 2 Oct 2023 11:06:17 +0100 Subject: [PATCH] Generalize "out of RAM" error to reflect other issues When qrexec-client-vm fails, it could be a symptom of various issues: - the system being out of RAM - dz-dvm not existing The exit code is the same in all cases (126), which makes it particularly tricky to solve in the client application. For this reason the approach is now to tell the user to see the qubes error notification on the top right of their screen. --- dangerzone/conversion/errors.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dangerzone/conversion/errors.py b/dangerzone/conversion/errors.py index 8c3ed9d..ca7924c 100644 --- a/dangerzone/conversion/errors.py +++ b/dangerzone/conversion/errors.py @@ -27,8 +27,8 @@ class ConversionException(Exception): class QubesNotEnoughRAMError(ConversionException): error_code = 126 # No ERROR_SHIFT since this is a qrexec error error_message = ( - "Your system does not have enough RAM available to start the conversion. " - "Please close some qubes or programs and try again." + "Could not start a disposable qube for the file conversion. " + "More information should have shown up on the top-right corner of your screen." )