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

[libcalamaresui] Complain about missing config files

Browse Source 
- When no config file is found, tell where it wasn't.
This commit is contained in:
Adriaan de Groot 2019-03-19 05:39:53 -04:00
parent e18e4e3d6f
commit 5a8ed8583f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,7 +169,8 @@ moduleConfigurationCandidates( bool assumeBuildDir, const QString& moduleName, c
void void
Module::loadConfigurationFile( const QString& configFileName ) //throws YAML::Exception Module::loadConfigurationFile( const QString& configFileName ) //throws YAML::Exception
{ {
foreach ( const QString& path, moduleConfigurationCandidates( Settings::instance()->debugMode(), m_name, configFileName ) ) QStringList configCandidates = moduleConfigurationCandidates( Settings::instance()->debugMode(), m_name, configFileName );
for ( const QString& path : configCandidates )
{ {
QFile configFile( path ); QFile configFile( path );
if ( configFile.exists() && configFile.open( QFile::ReadOnly | QFile::Text ) ) if ( configFile.exists() && configFile.open( QFile::ReadOnly | QFile::Text ) )
@ -198,6 +199,7 @@ Module::loadConfigurationFile( const QString& configFileName ) //throws YAML::Ex
return; return;
} }
} }
cDebug() << "No config file found in" << Logger::DebugList( configCandidates );
} }