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

[libcalamares] Use convenience Logger::NoQuote

Browse Source
This commit is contained in:
Adriaan de Groot 2020-04-21 16:42:48 +02:00
parent 6de82e6857
commit 86ffab1873
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libcalamares/utils/CalamaresUtilsSystem.cpp
View File

@ -195,7 +195,7 @@ System::runCommand( System::RunLocation location,
? ( static_cast< int >( std::chrono::milliseconds( timeoutSec ).count() ) ) ? ( static_cast< int >( std::chrono::milliseconds( timeoutSec ).count() ) )
: -1 ) ) : -1 ) )
{ {
( cWarning() << "Process" << args.first() << "timed out after" << timeoutSec.count() << "s. Output so far:\n" ).noquote().nospace() << process.readAllStandardOutput(); cWarning() << "Process" << args.first() << "timed out after" << timeoutSec.count() << "s. Output so far:\n" << Logger::NoQuote{} << process.readAllStandardOutput();
return ProcessResult::Code::TimedOut; return ProcessResult::Code::TimedOut;
} }
@ -203,7 +203,7 @@ System::runCommand( System::RunLocation location,
if ( process.exitStatus() == QProcess::CrashExit ) if ( process.exitStatus() == QProcess::CrashExit )
{ {
( cWarning() << "Process" << args.first() << "crashed. Output so far:\n" ).noquote().nospace() << output; cWarning() << "Process" << args.first() << "crashed. Output so far:\n" << Logger::NoQuote{} << output;
return ProcessResult::Code::Crashed; return ProcessResult::Code::Crashed;
} }
@ -212,7 +212,7 @@ System::runCommand( System::RunLocation location,
bool showDebug = ( !Calamares::Settings::instance() ) || ( Calamares::Settings::instance()->debugMode() ); bool showDebug = ( !Calamares::Settings::instance() ) || ( Calamares::Settings::instance()->debugMode() );
if ( ( r != 0 ) || showDebug ) if ( ( r != 0 ) || showDebug )
{ {
( cDebug() << "Target cmd:" << RedactedList( args ) << "output:\n" ).noquote().nospace() << output; cDebug() << "Target cmd:" << RedactedList( args ) << "output:\n" << Logger::NoQuote{} << output;
} }
return ProcessResult( r, output ); return ProcessResult( r, output );
} }

2
src/libcalamaresui/Branding.cpp
View File

@ -538,7 +538,7 @@ Branding::initSimpleSettings( const YAML::Node& doc )
[[noreturn]] void [[noreturn]] void
Branding::bail( const QString& message ) Branding::bail( const QString& message )
{ {
cError() << "FATAL in" << m_descriptorPath << "\n" + message; cError() << "FATAL in" << m_descriptorPath << Logger::Continuation << Logger::NoQuote{} << message;
::exit( EXIT_FAILURE ); ::exit( EXIT_FAILURE );
} }