More error message fine-tuning.

- Make sure errors are not overwritten in the executor.
- Do not report a process result for canceled processes. Such bogus
  errors currently spam the output, making it difficult to find
  the actual error that caused us to cancel the process in the first
  place.

Change-Id: I76d724d084532fbce243bf180d955d6f34ac0a91
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

2 files changed, 4 insertions, 1 deletions

diff --git a/src/lib/corelib/buildgraph/executor.cpp b/src/lib/corelib/buildgraph/executor.cpp
index f6066e6ec..8ce3203b7 100644
--- a/src/lib/corelib/buildgraph/executor.cpp
+++ b/src/lib/corelib/buildgraph/executor.cpp
@@ -639,7 +639,7 @@ void Executor::doSanityChecks()
 
 void Executor::handleError(const ErrorInfo &error)
 {
-    m_error = error;
+    m_error.append(error.toString());
     if (m_processingJobs.isEmpty())
         finish();
     else
diff --git a/src/lib/corelib/buildgraph/processcommandexecutor.cpp b/src/lib/corelib/buildgraph/processcommandexecutor.cpp
index b267a51aa..6a43a3eca 100644
--- a/src/lib/corelib/buildgraph/processcommandexecutor.cpp
+++ b/src/lib/corelib/buildgraph/processcommandexecutor.cpp
@@ -171,6 +171,9 @@ void ProcessCommandExecutor::doStart()
 
 void ProcessCommandExecutor::cancel()
 {
+    // We don't want this command to be reported as failing, since we explicitly terminated it.
+    disconnect(this, SIGNAL(reportProcessResult(qbs::ProcessResult)), 0, 0);
+
     m_process.terminate();
     if (!m_process.waitForFinished(1000))
         m_process.kill();