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

[modules] Use cError() as well

Browse Source 
- Switch KPMHelpers to using Calamares logging instead of qDebug()
This commit is contained in:
Adriaan de Groot 2018-02-13 11:14:45 +01:00
parent 3315df5df1
commit 3ae126f589
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libcalamaresui/Branding.cpp
View File

@ -291,7 +291,7 @@ Branding::setGlobals( GlobalStorage* globalStorage ) const
void void
Branding::bail( const QString& message ) Branding::bail( const QString& message )
{ {
cLog() << "FATAL ERROR in" cError() << "FATAL in"
<< m_descriptorPath << m_descriptorPath
<< "\n" + message; << "\n" + message;
::exit( EXIT_FAILURE ); ::exit( EXIT_FAILURE );

6
src/modules/partition/core/KPMHelpers.cpp
View File

@ -29,6 +29,8 @@
#include <kpmcore/backend/corebackendmanager.h> #include <kpmcore/backend/corebackendmanager.h>
#include <kpmcore/fs/luks.h> #include <kpmcore/fs/luks.h>
#include "utils/Logger.h"
#include <QDebug> #include <QDebug>
@ -46,7 +48,7 @@ initKPMcore()
QByteArray backendName = qgetenv( "KPMCORE_BACKEND" ); QByteArray backendName = qgetenv( "KPMCORE_BACKEND" );
if ( !CoreBackendManager::self()->load( backendName.isEmpty() ? CoreBackendManager::defaultBackendName() : backendName ) ) if ( !CoreBackendManager::self()->load( backendName.isEmpty() ? CoreBackendManager::defaultBackendName() : backendName ) )
{ {
qWarning() << "Failed to load backend plugin" << backendName; cWarning() << "Failed to load backend plugin" << backendName;
return false; return false;
} }
s_KPMcoreInited = true; s_KPMcoreInited = true;
@ -155,7 +157,7 @@ createNewEncryptedPartition( PartitionNode* parent,
) ); ) );
if ( !fs ) if ( !fs )
{ {
qDebug() << "ERROR: cannot create LUKS filesystem. Giving up."; cError() << "cannot create LUKS filesystem. Giving up.";
return nullptr; return nullptr;
} }

4
src/modules/partition/core/PartUtils.cpp
View File

@ -281,11 +281,11 @@ runOsprober( PartitionCoreModule* core )
osprober.start(); osprober.start();
if ( !osprober.waitForStarted() ) if ( !osprober.waitForStarted() )
{ {
cDebug() << "ERROR: os-prober cannot start."; cError() << "os-prober cannot start.";
} }
else if ( !osprober.waitForFinished( 60000 ) ) else if ( !osprober.waitForFinished( 60000 ) )
{ {
cDebug() << "ERROR: os-prober timed out."; cError() << "os-prober timed out.";
} }
else else
{ {