feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ShellCommand: Remove exitCode arg from finished() signal

Browse Source 
The only 2 handlers were taking it into account and
they interpreted the non-zero exit code as a failure,
so basically they repeated the work of default
exitCodeInterpreter.

Change-Id: I9848ef0cf5ca9017f02a02ae59dc09ec426f7626
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2022-07-29 12:28:01 +02:00
parent c27c36a64b
commit 82553f16a1
8 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/utils/shellcommand.cpp
View File

@@ -257,7 +257,6 @@ void ShellCommand::run(QFutureInterface<void> &future)
else
future.setProgressRange(0, 1);
const int count = d->m_jobs.size();
int lastExecExitCode = -1;
bool lastExecSuccess = true;
for (int j = 0; j < count; j++) {
const Internal::ShellCommandPrivate::Job &job = d->m_jobs.at(j);
@@ -267,7 +266,6 @@ void ShellCommand::run(QFutureInterface<void> &future)
runCommand(proc, job.command, job.workingDirectory);
stdOut += proc.cleanedStdOut();
stdErr += proc.cleanedStdErr();
lastExecExitCode = proc.exitCode();
lastExecSuccess = proc.result() == ProcessResult::FinishedWithSuccess;
if (!lastExecSuccess)
break;
@@ -280,7 +278,7 @@ void ShellCommand::run(QFutureInterface<void> &future)
emit stdErrText(stdErr);
}
emit finished(lastExecSuccess, lastExecExitCode, cookie());
emit finished(lastExecSuccess, cookie());
if (lastExecSuccess) {
emit success(cookie());
future.setProgressValue(future.progressMaximum());