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

Configs: empty config files are ok.

Browse Source 
The default umount.conf contains no keys -- so it isn't a map,
but it is a valid config file. Avoid the warning by accepting
empty files.

FIX 707
This commit is contained in:
Adriaan de Groot 2017-06-02 16:10:08 +02:00 committed by Philip
parent 0659fc72b8
commit 1415ec69be
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libcalamaresui/modulesystem/Module.cpp
View File

@ -176,6 +176,12 @@ Module::loadConfigurationFile( const QString& configFileName ) //throws YAML::Ex
QByteArray ba = configFile.readAll(); QByteArray ba = configFile.readAll();
YAML::Node doc = YAML::Load( ba.constData() ); YAML::Node doc = YAML::Load( ba.constData() );
if ( doc.IsNull() )
{
// Special case: empty config files are valid,
// but aren't a map.
return;
}
if ( !doc.IsMap() ) if ( !doc.IsMap() )
{ {
cLog() << Q_FUNC_INFO << "bad module configuration format" cLog() << Q_FUNC_INFO << "bad module configuration format"