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

[welcome] Be louder when libparted is disabled

Browse Source
This commit is contained in:
Adriaan de Groot 2019-02-25 08:44:08 -05:00
parent c3d13e3451
commit 9889bd6cbe
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -187,6 +187,18 @@ GeneralRequirements::setConfigurationMap( const QVariantMap& configurationMap )
incompleteConfiguration = true; incompleteConfiguration = true;
} }
#ifdef WITHOUT_LIBPARTED
if ( m_entriesToCheck.contains( "storage" ) )
cWarning() << "GeneralRequirements checks 'storage' but libparted is disabled.";
if ( 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.";
m_entriesToRequire.removeAll( "storage" );
}
#endif
// Help out with consistency, but don't fix // Help out with consistency, but don't fix
for ( const auto& r : m_entriesToRequire ) for ( const auto& r : m_entriesToRequire )
if ( !m_entriesToCheck.contains( r ) ) if ( !m_entriesToCheck.contains( r ) )