applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-29 10: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-08-10 12:02:57 -04:00
commit bf40f3bd23
462 changed files with 28533 additions and 17939 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
/* === This file is part of Calamares - <https://github.com/calamares> ===
*
* Copyright 2014-2017, Teo Mrnjavac <teo@kde.org>
* Copyright 2017, Adriaan de Groot <groot@kde.org>
* Copyright 2017-2018, Adriaan de Groot <groot@kde.org>
* Copyright 2017, Gabriel Craciunescu <crazy@frugalware.org>
*
* Calamares is free software: you can redistribute it and/or modify
@ -90,12 +90,13 @@ Calamares::RequirementsList RequirementsChecker::checkRequirements(QWidget* some
if ( m_entriesToCheck.contains( "root" ) )
isRoot = checkIsRoot();
using TR = Logger::DebugRow<const char *, bool>;
cDebug() << "RequirementsChecker output:"
<< " enoughStorage:" << enoughStorage
<< " enoughRam:" << enoughRam
<< " hasPower:" << hasPower
<< " hasInternet:" << hasInternet
<< " isRoot:" << isRoot;
<< TR("enoughStorage", enoughStorage)
<< TR("enoughRam", enoughRam)
<< TR("hasPower", hasPower)
<< TR("hasInternet", hasInternet)
<< TR("isRoot", isRoot);
Calamares::RequirementsList checkEntries;
foreach ( const QString& entry, m_entriesToCheck )
@ -255,7 +256,9 @@ RequirementsChecker::setConfigurationMap( const QVariantMap& configurationMap )
}
if ( incompleteConfiguration )
cWarning() << "RequirementsChecker configuration map:\n" << configurationMap;
{
cWarning() << "RequirementsChecker configuration map:" << Logger::DebugMap( configurationMap );
}
}