From dc247e1d622f027aa195cefc6de52d8e4cca8c13 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 7 May 2014 16:30:41 +0200 Subject: Executor: Record only the first failing job's error message. Otherwise we end up with irrelevant "Transformer canceled" messages, while the actual error gets lost. Change-Id: I81de84d75cdd94471c13012f23bca5bfd663ab96 Reviewed-by: Joerg Bornemann --- src/lib/corelib/buildgraph/executor.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/corelib/buildgraph/executor.cpp b/src/lib/corelib/buildgraph/executor.cpp index 1b37c17d1..024decbc7 100644 --- a/src/lib/corelib/buildgraph/executor.cpp +++ b/src/lib/corelib/buildgraph/executor.cpp @@ -818,7 +818,8 @@ void Executor::onJobFinished(const qbs::ErrorInfo &err) fullWarning.prepend(Tr::tr("Ignoring the following errors on user request:")); m_logger.printWarning(fullWarning); } else { - m_error = err; + if (!m_error.hasError()) + m_error = err; // All but the first one could be due to canceling. } } -- cgit v1.2.3