mirror of
https://github.com/parchlinux/calamares.git
synced 2025-06-23 23:48:22 -04:00
[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:
parent
d6731efdfd
commit
54a9bbb949
1 changed files with 2 additions and 1 deletions
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue