From 64d754701f347972ab46936a2e8b1ccb2d117a7f Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Mon, 18 Mar 2024 14:41:36 -0700 Subject: [PATCH] storage: Show better error message Tests: - In a VM, mount a loopback disk. Insert an error in ejected code and notice that HTML message is shown properly during eject operation. Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- plinth/modules/storage/views.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/plinth/modules/storage/views.py b/plinth/modules/storage/views.py index 851929cb7..8a05cdf52 100644 --- a/plinth/modules/storage/views.py +++ b/plinth/modules/storage/views.py @@ -14,7 +14,7 @@ from django.views.decorators.http import require_POST from plinth import views from plinth.modules import storage -from . import get_error_message, privileged +from . import privileged logger = logging.getLogger(__name__) @@ -90,12 +90,6 @@ def eject(request, device_path): else: messages.success(request, _('Device can be safely unplugged.')) except Exception as exception: - message = get_error_message(exception.args[-2].decode()) # stdout - - logger.error('Error ejecting device - %s', message) - messages.error( - request, - _('Error ejecting device: {error_message}').format( - error_message=message)) + views.messages_error(request, _('Error ejecting device.'), exception) return redirect(reverse('storage:index'))