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

[libcalamares] Handle last-output-line without newline

Browse Source
This commit is contained in:
Adriaan de Groot 2021-11-02 22:58:41 +01:00
parent 0a339a5402
commit aa315c0696
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -178,7 +178,13 @@ Calamares::Utils::Runner::run()
return ProcessResult::Code::TimedOut; return ProcessResult::Code::TimedOut;
} }
QString output = QString::fromLocal8Bit( process.readAllStandardOutput() ).trimmed(); QString output = m_output ? process.readAllStandardOutput()
: QString::fromLocal8Bit( process.readAllStandardOutput() ).trimmed();
if ( m_output && !output.isEmpty() )
{
Q_EMIT this->output( output );
output = QString();
}
if ( process.exitStatus() == QProcess::CrashExit ) if ( process.exitStatus() == QProcess::CrashExit )
{ {