[libcalamares] Don't eat output on timeout.

- Copy stdout from timed-out process into the output variable,
   instead of just dumping it into the log file. This will
   improve the user experience, too, because they will get some
   feedback / explanation of what the process has done.
This commit is contained in:
Adriaan de Groot 2018-01-26 18:19:35 +01:00
parent d6731efdfd
commit 54a9bbb949

View File

@ -128,7 +128,8 @@ ProcessJob::callOutput( const QString& command,
if ( !process.waitForFinished( timeoutSec ? ( timeoutSec * 1000 ) : -1 ) )
{
cLog() << "Timed out. output so far:";
cLog() << process.readAllStandardOutput();
output.append( QString::fromLocal8Bit( process.readAllStandardOutput() ).trimmed() );
cLog() << output;
return -4;
}