napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[welcome] Without libparted, don't even check size available

Browse Source
This commit is contained in:
Adriaan de Groot 2019-02-25 10:07:21 -05:00
parent 8cf3c217f7
commit 33bd6c67c0
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/modules/welcome/checker/GeneralRequirements.cpp
View File

@ -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