From 1415ec69befd1cb8138d0b593a5a083902030f84 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 2 Jun 2017 16:10:08 +0200 Subject: [PATCH] Configs: empty config files are ok. 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 --- src/libcalamaresui/modulesystem/Module.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/libcalamaresui/modulesystem/Module.cpp b/src/libcalamaresui/modulesystem/Module.cpp index 5395ff7f2..1b3da87e8 100644 --- a/src/libcalamaresui/modulesystem/Module.cpp +++ b/src/libcalamaresui/modulesystem/Module.cpp @@ -176,6 +176,12 @@ Module::loadConfigurationFile( const QString& configFileName ) //throws YAML::Ex QByteArray ba = configFile.readAll(); 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() ) { cLog() << Q_FUNC_INFO << "bad module configuration format"