applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-07-01 11:25:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into requirements-checking

Browse source
This commit is contained in:
Adriaan de Groot 2018-03-06 17:06:35 +01:00
commit c7629182e4
229 changed files with 20045 additions and 6562 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/modules/welcome/checker/RequirementsChecker.cpp
View file

@ -170,7 +170,7 @@ RequirementsChecker::setConfigurationMap( const QVariantMap& configurationMap )
}
else
{
cDebug() << "WARNING: RequirementsChecker entry 'check' is incomplete.";
cWarning() << "RequirementsChecker entry 'check' is incomplete.";
incompleteConfiguration = true;
}
@ -182,14 +182,14 @@ RequirementsChecker::setConfigurationMap( const QVariantMap& configurationMap )
}
else
{
cDebug() << "WARNING: RequirementsChecker entry 'required' is incomplete.";
cWarning() << "RequirementsChecker entry 'required' is incomplete.";
incompleteConfiguration = true;
}
// Help out with consistency, but don't fix
for ( const auto& r : m_entriesToRequire )
if ( !m_entriesToCheck.contains( r ) )
cDebug() << "WARNING: RequirementsChecker requires" << r << "but does not check it.";
cWarning() << "RequirementsChecker requires" << r << "but does not check it.";
if ( configurationMap.contains( "requiredStorage" ) &&
( configurationMap.value( "requiredStorage" ).type() == QVariant::Double ||
@ -199,7 +199,7 @@ RequirementsChecker::setConfigurationMap( const QVariantMap& configurationMap )
m_requiredStorageGB = configurationMap.value( "requiredStorage" ).toDouble( &ok );
if ( !ok )
{
cDebug() << "WARNING: RequirementsChecker entry 'requiredStorage' is invalid.";
cWarning() << "RequirementsChecker entry 'requiredStorage' is invalid.";
m_requiredStorageGB = 3.;
}
@ -207,7 +207,7 @@ RequirementsChecker::setConfigurationMap( const QVariantMap& configurationMap )
}
else
{
cDebug() << "WARNING: RequirementsChecker entry 'requiredStorage' is missing.";
cWarning() << "RequirementsChecker entry 'requiredStorage' is missing.";
m_requiredStorageGB = 3.;
incompleteConfiguration = true;
}
@ -220,14 +220,14 @@ RequirementsChecker::setConfigurationMap( const QVariantMap& configurationMap )
m_requiredRamGB = configurationMap.value( "requiredRam" ).toDouble( &ok );
if ( !ok )
{
cDebug() << "WARNING: RequirementsChecker entry 'requiredRam' is invalid.";
cWarning() << "RequirementsChecker entry 'requiredRam' is invalid.";
m_requiredRamGB = 1.;
incompleteConfiguration = true;
}
}
else
{
cDebug() << "WARNING: RequirementsChecker entry 'requiredRam' is missing.";
cWarning() << "RequirementsChecker entry 'requiredRam' is missing.";
m_requiredRamGB = 1.;
incompleteConfiguration = true;
}
@ -239,7 +239,7 @@ RequirementsChecker::setConfigurationMap( const QVariantMap& configurationMap )
if ( m_checkHasInternetUrl.isEmpty() ||
!QUrl( m_checkHasInternetUrl ).isValid() )
{
cDebug() << "WARNING: RequirementsChecker entry 'internetCheckUrl' is invalid in welcome.conf" << m_checkHasInternetUrl
cWarning() << "RequirementsChecker entry 'internetCheckUrl' is invalid in welcome.conf" << m_checkHasInternetUrl
<< "reverting to default (http://example.com).";
m_checkHasInternetUrl = "http://example.com";
incompleteConfiguration = true;
@ -247,7 +247,7 @@ RequirementsChecker::setConfigurationMap( const QVariantMap& configurationMap )
}
else
{
cDebug() << "WARNING: RequirementsChecker entry 'internetCheckUrl' is undefined in welcome.conf,"
cWarning() << "RequirementsChecker entry 'internetCheckUrl' is undefined in welcome.conf,"
"reverting to default (http://example.com).";
m_checkHasInternetUrl = "http://example.com";
@ -255,7 +255,7 @@ RequirementsChecker::setConfigurationMap( const QVariantMap& configurationMap )
}
if ( incompleteConfiguration )
cDebug() << "WARNING: RequirementsChecker configuration map:\n" << configurationMap;
cWarning() << "RequirementsChecker configuration map:\n" << configurationMap;
}
@ -263,7 +263,8 @@ bool
RequirementsChecker::checkEnoughStorage( qint64 requiredSpace )
{
#ifdef WITHOUT_LIBPARTED
cDebug() << "WARNING: RequirementsChecker is configured without libparted.";
Q_UNUSED( requiredSpace );
cWarning() << "RequirementsChecker is configured without libparted.";
return false;
#else
return check_big_enough( requiredSpace );