From 33bd6c67c012a7facd20a5cc221f4f807687d64e Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 25 Feb 2019 10:07:21 -0500 Subject: [PATCH] [welcome] Without libparted, don't even check size available --- src/modules/welcome/checker/GeneralRequirements.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/modules/welcome/checker/GeneralRequirements.cpp b/src/modules/welcome/checker/GeneralRequirements.cpp index 7880d3c65..4fcd8129d 100644 --- a/src/modules/welcome/checker/GeneralRequirements.cpp +++ b/src/modules/welcome/checker/GeneralRequirements.cpp @@ -188,13 +188,12 @@ GeneralRequirements::setConfigurationMap( const QVariantMap& configurationMap ) } #ifdef WITHOUT_LIBPARTED - if ( m_entriesToCheck.contains( "storage" ) ) - cWarning() << "GeneralRequirements checks 'storage' but libparted is disabled."; - if ( m_entriesToRequire.contains( "storage" ) ) + if ( m_entriesToCheck.contains( "storage" ) || m_entriesToRequire.contains( "storage" ) ) { // Warn, but also drop the required bit because otherwise installation // will be impossible (because the check always returns false). - cWarning() << "GeneralRequirements requires 'storage' check but libparted is disabled."; + cWarning() << "GeneralRequirements checks 'storage' but libparted is disabled."; + m_entriesToCheck.removeAll( "storage" ); m_entriesToRequire.removeAll( "storage" ); } #endif