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

[shellprocess] Make explicit that an error code has been ignored, by logging it.

Browse Source
This commit is contained in:
Adriaan de Groot 2018-01-15 05:26:20 -05:00
parent e48767eaa6
commit 8571fd800e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/modules/shellprocess/ShellProcessJob.cpp
View File

@ -99,9 +99,12 @@ ShellProcessJob::exec()
CalamaresUtils::ProcessResult r = System::runCommand( CalamaresUtils::ProcessResult r = System::runCommand(
location, shell_cmd, QString(), QString(), 10 ); location, shell_cmd, QString(), QString(), 10 );
if ( ( r.getExitCode() != 0 ) && !suppress_result ) if ( r.getExitCode() != 0 )
{ {
return Calamares::JobResult::error( tr( "Could not run command." ), r.getOutput() ); if ( suppress_result )
cDebug() << "Error code" << r.getExitCode() << "ignored by ShellProcess configuration.";
else
return Calamares::JobResult::error( tr( "Could not run command." ), r.getOutput() );
} }
} }