diff options
author | Christian Kandeler <christian.kandeler@digia.com> | 2014-05-07 16:30:41 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-05-07 17:32:34 +0200 |
commit | dc247e1d622f027aa195cefc6de52d8e4cca8c13 (patch) | |
tree | 965a0df76e3bca121a3d848adbcb7be1449e8aa4 /src/lib | |
parent | 6faf6d1bbf08b487194b2144961f78280362f5bb (diff) |
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 <joerg.bornemann@digia.com>
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/corelib/buildgraph/executor.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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. } } |