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

[libcalamaresui] Only load config file if there is one

Browse Source 
- finally, no more warnings for modules that are NO_CONFIG
   (or noconfig: true) and don't have a config file.
This commit is contained in:
Adriaan de Groot 2020-01-24 21:47:54 +01:00
parent f366e3840f
commit 83ffbd5126
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,6 +155,8 @@ Module::fromDescriptor( const Calamares::ModuleSystem::Descriptor& moduleDescrip
} }
m->initFrom( moduleDescriptor ); m->initFrom( moduleDescriptor );
if ( !configFileName.isEmpty() )
{
try try
{ {
m->loadConfigurationFile( configFileName ); m->loadConfigurationFile( configFileName );
@ -164,6 +166,7 @@ Module::fromDescriptor( const Calamares::ModuleSystem::Descriptor& moduleDescrip
cError() << "YAML parser error " << e.what(); cError() << "YAML parser error " << e.what();
return nullptr; return nullptr;
} }
}
return m.release(); return m.release();
} }