From e3b5e01435fe436d12ec21d35d9f3757a4a99d38 Mon Sep 17 00:00:00 2001 From: Eberhard Graether Date: Tue, 5 Feb 2019 14:16:52 +0100 Subject: [PATCH] logic: Show errors when executing custom commands in info message --- src/lib_gui/utility/utilityApp.cpp | 9 ++++++++- testing/project_setup/custom_command_python/1_setup.sh | 0 testing/project_setup/custom_command_python/2_update.sh | 0 .../project_setup/custom_command_python/3_teardown.sh | 0 4 files changed, 8 insertions(+), 1 deletion(-) mode change 100644 => 100755 testing/project_setup/custom_command_python/1_setup.sh mode change 100644 => 100755 testing/project_setup/custom_command_python/2_update.sh mode change 100644 => 100755 testing/project_setup/custom_command_python/3_teardown.sh diff --git a/src/lib_gui/utility/utilityApp.cpp b/src/lib_gui/utility/utilityApp.cpp index 93200c69..8712335a 100644 --- a/src/lib_gui/utility/utilityApp.cpp +++ b/src/lib_gui/utility/utilityApp.cpp @@ -157,7 +157,14 @@ int utility::executeProcessAndGetExitCode( if (processOutput != nullptr) { - *processOutput = utility::trim(QString(process.readAll()).toStdWString()); + if (exitCode != 0) + { + *processOutput = utility::trim(QString(process.readAllStandardError()).toStdWString()); + } + else + { + *processOutput = utility::trim(QString(process.readAll()).toStdWString()); + } } process.close(); diff --git a/testing/project_setup/custom_command_python/1_setup.sh b/testing/project_setup/custom_command_python/1_setup.sh old mode 100644 new mode 100755 diff --git a/testing/project_setup/custom_command_python/2_update.sh b/testing/project_setup/custom_command_python/2_update.sh old mode 100644 new mode 100755 diff --git a/testing/project_setup/custom_command_python/3_teardown.sh b/testing/project_setup/custom_command_python/3_teardown.sh old mode 100644 new mode 100755