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

[libcalamaresui] Use cError() for logging errors, not cLog()

Browse Source
This commit is contained in:
Adriaan de Groot 2018-03-28 09:22:37 -04:00
parent e2b8fb0afe
commit 3e30bb682e
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,8 +72,7 @@ Module::fromDescriptor( const QVariantMap& moduleDescriptor,
if ( typeString.isEmpty() || if ( typeString.isEmpty() ||
intfString.isEmpty() ) intfString.isEmpty() )
{ {
cLog() << Q_FUNC_INFO << "bad module descriptor format" cError() << "Bad module descriptor format" << instanceId;
<< instanceId;
return nullptr; return nullptr;
} }
if ( ( typeString == "view" ) || ( typeString == "viewmodule" ) ) if ( ( typeString == "view" ) || ( typeString == "viewmodule" ) )
@ -87,11 +86,11 @@ Module::fromDescriptor( const QVariantMap& moduleDescriptor,
#ifdef WITH_PYTHONQT #ifdef WITH_PYTHONQT
m = new PythonQtViewModule(); m = new PythonQtViewModule();
#else #else
cLog() << "PythonQt modules are not supported in this version of Calamares."; cError() << "PythonQt modules are not supported in this version of Calamares.";
#endif #endif
} }
else else
cLog() << "Bad interface" << intfString << "for module type" << typeString; cError() << "Bad interface" << intfString << "for module type" << typeString;
} }
else if ( typeString == "job" ) else if ( typeString == "job" )
{ {
@ -108,18 +107,18 @@ Module::fromDescriptor( const QVariantMap& moduleDescriptor,
#ifdef WITH_PYTHON #ifdef WITH_PYTHON
m = new PythonJobModule(); m = new PythonJobModule();
#else #else
cLog() << "Python modules are not supported in this version of Calamares."; cError() << "Python modules are not supported in this version of Calamares.";
#endif #endif
} }
else else
cLog() << "Bad interface" << intfString << "for module type" << typeString; cError() << "Bad interface" << intfString << "for module type" << typeString;
} }
else else
cLog() << "Bad module type" << typeString; cError() << "Bad module type" << typeString;
if ( !m ) if ( !m )
{ {
cLog() << "Bad module type (" << typeString cDebug() << "Bad module type (" << typeString
<< ") or interface string (" << intfString << ") or interface string (" << intfString
<< ") for module " << instanceId; << ") for module " << instanceId;
return nullptr; return nullptr;
@ -130,8 +129,8 @@ Module::fromDescriptor( const QVariantMap& moduleDescriptor,
m->m_directory = moduleDir.absolutePath(); m->m_directory = moduleDir.absolutePath();
else else
{ {
cLog() << Q_FUNC_INFO << "bad module directory" cError() << "Bad module directory" << moduleDirectory
<< instanceId; << "for" << instanceId;
delete m; delete m;
return nullptr; return nullptr;
} }