applications/calamares
3
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-02-24 10:55:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

[libcalamares] Improve explanation of failed processes.

Browse source
This commit is contained in:
Adriaan de Groot 2018-01-15 05:51:58 -05:00
parent 8571fd800e
commit 60f4dd7b3b
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/libcalamares/utils/CalamaresUtilsSystem.cpp
View file

@ -258,34 +258,37 @@ ProcessResult::explainProcess( const QObject* parent, int ec, const QString& com
if ( ec == 0 )
return JobResult::ok();
QString outputMessage = output.isEmpty() ? QStringLiteral("\nThere was no output from the command.")
: (parent->tr("\nOutput:\n") + output);
if ( ec == -1 ) //Crash!
return JobResult::error( parent->tr( "External command crashed" ),
parent->tr( "Command %1 crashed.\nOutput:\n%2" )
return JobResult::error( parent->tr( "External command crashed." ),
parent->tr( "Command <i>%1</i> crashed." )
.arg( command )
.arg( output ) );
+ outputMessage );
if ( ec == -2 )
return JobResult::error( parent->tr( "External command failed to start" ),
parent->tr( "Command %1 failed to start." )
return JobResult::error( parent->tr( "External command failed to start." ),
parent->tr( "Command <i>%1</i> failed to start." )
.arg( command ) );
if ( ec == -3 )
return JobResult::error( parent->tr( "Internal error when starting command" ),
return JobResult::error( parent->tr( "Internal error when starting command." ),
parent->tr( "Bad parameters for process job call." ) );
if ( ec == -4 )
return JobResult::error( parent->tr( "External command failed to finish" ),
parent->tr( "Command %1 failed to finish in %2s.\nOutput:\n%3" )
return JobResult::error( parent->tr( "External command failed to finish." ),
parent->tr( "Command <i>%1</i> failed to finish in %2 seconds." )
.arg( command )
.arg( timeout )
.arg( output ) );
+ outputMessage );
//Any other exit code
return JobResult::error( parent->tr( "External command finished with errors" ),
parent->tr( "Command %1 finished with exit code %2.\nOutput:\n%3" )
return JobResult::error( parent->tr( "External command finished with errors." ),
parent->tr( "Command <i>%1</i> finished with exit code %2." )
.arg( command )
.arg( ec )
.arg( output ) );
+ outputMessage );
}
} // namespace

2
src/modules/shellprocess/ShellProcessJob.cpp
View file

@ -104,7 +104,7 @@ ShellProcessJob::exec()
if ( suppress_result )
cDebug() << "Error code" << r.getExitCode() << "ignored by ShellProcess configuration.";
else
return Calamares::JobResult::error( tr( "Could not run command." ), r.getOutput() );
return r.explainProcess( this, processed_cmd, 10 );
}
}