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

[libcalamares] Avoid stray space when logging command-output

Browse Source
This commit is contained in:
Adriaan de Groot 2024-06-30 15:33:16 +02:00
parent 091c00e4ef
commit 8bb6c63931
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libcalamares/utils/Runner.cpp
View File

@ -189,8 +189,9 @@ Calamares::Utils::Runner::run()
? ( static_cast< int >( std::chrono::milliseconds( m_timeout ).count() ) ) ? ( static_cast< int >( std::chrono::milliseconds( m_timeout ).count() ) )
: -1 ) ) : -1 ) )
{ {
cWarning() << "Process" << m_command.first() << "timed out after" << m_timeout.count() << "ms. Output so far:\n" cWarning() << "Process" << m_command.first() << "timed out after" << m_timeout.count() << "ms."
<< Logger::NoQuote << process.readAllStandardOutput(); << Logger::NoQuote << "Output so far:\n"
<< process.readAllStandardOutput();
return ProcessResult::Code::TimedOut; return ProcessResult::Code::TimedOut;
} }
@ -216,7 +217,7 @@ Calamares::Utils::Runner::run()
if ( process.exitStatus() == QProcess::CrashExit ) if ( process.exitStatus() == QProcess::CrashExit )
{ {
cWarning() << "Process" << m_command.first() << "crashed. Output so far:\n" << Logger::NoQuote << output; cWarning() << "Process" << m_command.first() << "crashed." << Logger::NoQuote << "Output so far:\n" << output;
return ProcessResult::Code::Crashed; return ProcessResult::Code::Crashed;
} }
@ -226,7 +227,7 @@ Calamares::Utils::Runner::run()
{ {
if ( showDebug && !output.isEmpty() ) if ( showDebug && !output.isEmpty() )
{ {
cDebug() << Logger::SubEntry << "Finished. Exit code:" << r << "output:\n" << Logger::NoQuote << output; cDebug() << Logger::SubEntry << "Finished. Exit code:" << r << Logger::NoQuote << "output:\n" << output;
} }
} }
else // if ( r != 0 ) else // if ( r != 0 )
@ -234,8 +235,8 @@ Calamares::Utils::Runner::run()
if ( !output.isEmpty() ) if ( !output.isEmpty() )
{ {
cDebug() << Logger::SubEntry << "Target cmd:" << Logger::RedactedCommand( m_command ) << "Exit code:" << r cDebug() << Logger::SubEntry << "Target cmd:" << Logger::RedactedCommand( m_command ) << "Exit code:" << r
<< "output:\n" << Logger::NoQuote << "output:\n"
<< Logger::NoQuote << output; << output;
} }
else else
{ {