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

[libcalamares] Improve error logging during module loading

Browse Source
This commit is contained in:
Adriaan de Groot 2018-03-01 12:24:00 +01:00
parent 182458ad5a
commit cdadc2f003
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calamares/testmain.cpp
View File

@ -162,7 +162,7 @@ main( int argc, char* argv[] )
Calamares::Module* m = load_module( module ); Calamares::Module* m = load_module( module );
if ( !m ) if ( !m )
{ {
cError() << "No module.desc data found in" << module.moduleName(); cError() << "Could not load module" << module.moduleName();
return 1; return 1;
} }

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

@ -86,7 +86,7 @@ Module::fromDescriptor( const QVariantMap& moduleDescriptor,
#ifdef WITH_PYTHONQT #ifdef WITH_PYTHONQT
m = new PythonQtViewModule(); m = new PythonQtViewModule();
#else #else
cError() << "PythonQt modules are not supported in this version of Calamares."; cError() << "PythonQt view modules are not supported in this version of Calamares.";
#endif #endif
} }
else else
@ -118,7 +118,7 @@ Module::fromDescriptor( const QVariantMap& moduleDescriptor,
if ( !m ) if ( !m )
{ {
cDebug() << "Bad module type (" << typeString cError() << "Bad module type (" << typeString
<< ") or interface string (" << intfString << ") or interface string (" << intfString
<< ") for module " << instanceId; << ") for module " << instanceId;
return nullptr; return nullptr;
@ -129,8 +129,7 @@ Module::fromDescriptor( const QVariantMap& moduleDescriptor,
m->m_directory = moduleDir.absolutePath(); m->m_directory = moduleDir.absolutePath();
else else
{ {
cError() << "Bad module directory" << moduleDirectory cError() << "Bad module directory" << moduleDirectory << "for" << instanceId;
<< "for" << instanceId;
delete m; delete m;
return nullptr; return nullptr;
} }
@ -144,7 +143,7 @@ Module::fromDescriptor( const QVariantMap& moduleDescriptor,
} }
catch ( YAML::Exception& e ) catch ( YAML::Exception& e )
{ {
cWarning() << "YAML parser error " << e.what(); cError() << "YAML parser error " << e.what();
delete m; delete m;
return nullptr; return nullptr;
} }