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

Modules: accept 'viewmodule' as alias of 'view', improve logging on error.

Browse Source
This commit is contained in:
Adriaan de Groot 2017-07-05 12:10:06 -04:00
parent 47e95b32a9
commit e3008657c4
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,7 +76,7 @@ Module::fromDescriptor( const QVariantMap& moduleDescriptor,
<< instanceId; << instanceId;
return nullptr; return nullptr;
} }
if ( typeString == "view" ) if ( ( typeString == "view" ) || ( typeString == "viewmodule" ) )
{ {
if ( intfString == "qtplugin" ) if ( intfString == "qtplugin" )
{ {
@ -88,6 +88,8 @@ Module::fromDescriptor( const QVariantMap& moduleDescriptor,
m = new PythonQtViewModule(); m = new PythonQtViewModule();
} }
#endif #endif
else
cLog() << "Bad interface" << intfString << "for module type" << typeString;
} }
else if ( typeString == "job" ) else if ( typeString == "job" )
{ {
@ -105,7 +107,12 @@ Module::fromDescriptor( const QVariantMap& moduleDescriptor,
m = new PythonJobModule(); m = new PythonJobModule();
} }
#endif #endif
else
cLog() << "Bad interface" << intfString << "for module type" << typeString;
} }
else
cLog() << "Bad module type" << typeString;
if ( !m ) if ( !m )
{ {
cLog() << Q_FUNC_INFO << "bad module type or interface string" cLog() << Q_FUNC_INFO << "bad module type or interface string"