From eb7c6385cdce9c76c27bdb6c6518a4e407e2e357 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 1 Oct 2018 04:14:15 -0400 Subject: [PATCH] [fsresizer] Bail out if resize required but not feasible --- src/modules/fsresizer/ResizeFSJob.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/modules/fsresizer/ResizeFSJob.cpp b/src/modules/fsresizer/ResizeFSJob.cpp index 254e80adb..886ce803a 100644 --- a/src/modules/fsresizer/ResizeFSJob.cpp +++ b/src/modules/fsresizer/ResizeFSJob.cpp @@ -297,9 +297,14 @@ ResizeFSJob::exec() : tr( "The device %1 can not be resized." ).arg(m_devicename) ); if ( new_end == 0 ) { - // TODO: is that a bad thing? is the resize required? cWarning() << "Resize operation on" << m_fsname << m_devicename << "skipped as not-useful."; + if ( m_required ) + return Calamares::JobResult::error( + tr( "Resize Failed" ), + !m_fsname.isEmpty() ? tr( "The filesystem %1 must be resized, but cannot." ).arg(m_fsname) + : tr( "The device %11 must be resized, but cannot" ).arg(m_fsname) ); + return Calamares::JobResult::ok(); }