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 remote-tracking branch 'origin/issue-1100'

Browse source
This commit is contained in:
Adriaan de Groot 2019-04-11 11:47:00 +02:00
commit 713370da55
15 changed files with 217 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libcalamares/Settings.cpp
View file

@ -35,7 +35,7 @@ hasValue( const YAML::Node& v )
return v.IsDefined() && !v.IsNull();
}
/** Helper function to grab a QString out of the config, and to warn if not present. */
/** @brief Helper function to grab a QString out of the config, and to warn if not present. */
static QString
requireString( const YAML::Node& config, const char* key )
{
@ -49,7 +49,7 @@ requireString( const YAML::Node& config, const char* key )
}
}
/** Helper function to grab a bool out of the config, and to warn if not present. */
/** @brief Helper function to grab a bool out of the config, and to warn if not present. */
static bool
requireBool( const YAML::Node& config, const char* key, bool d )
{
@ -204,6 +204,7 @@ Settings::Settings( const QString& settingsFilePath,
m_brandingComponentName = requireString( config, "branding" );
m_promptInstall = requireBool( config, "prompt-install", false );
m_doChroot = !requireBool( config, "dont-chroot", false );
m_isSetupMode = requireBool( config, "oem-setup", !m_doChroot );
m_disableCancel = requireBool( config, "disable-cancel", false );
}
catch ( YAML::Exception& e )