aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@qt.io>2020-05-18 09:30:42 +0200
committerTim Jenssen <tim.jenssen@qt.io>2020-05-18 07:55:59 +0000
commit1aaeea0f4d59df463cf4da087782ab41d1505c77 (patch)
tree07c56e47ae37df2a9e91be76b1c6183b2504efb5
parentef9a90deb0d082288a5336867bc9b018d20e4daa (diff)
add onlyErrorCaseOutput to runInstallCommand
Change-Id: Ia07cab8c96c6bd0e1371f15b081c110e4791fd7d Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
-rw-r--r--packaging-tools/bld_utils.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/packaging-tools/bld_utils.py b/packaging-tools/bld_utils.py
index e8dabae1f..d0ce059c4 100644
--- a/packaging-tools/bld_utils.py
+++ b/packaging-tools/bld_utils.py
@@ -379,7 +379,7 @@ def runCommand(command, currentWorkingDirectory, callerArguments = None, init_en
raise Exception("Different exit code then expected({0}): {1}{2}".format(expectedExitCodes, exitCode, prettyLastOutput))
return exitCode
-def runInstallCommand(arguments = ['install'], currentWorkingDirectory = None, callerArguments = None, init_environment = None):
+def runInstallCommand(arguments = ['install'], currentWorkingDirectory = None, callerArguments = None, init_environment = None, onlyErrorCaseOutput = False):
if init_environment is None:
init_environment = {}
if hasattr(callerArguments, 'installcommand') and callerArguments.installcommand:
@@ -392,7 +392,7 @@ def runInstallCommand(arguments = ['install'], currentWorkingDirectory = None, c
if arguments:
installcommand.extend(arguments if __builtin__.type(arguments) is list else arguments.split())
- return runCommand(installcommand, currentWorkingDirectory, callerArguments, init_environment = init_environment)
+ return runCommand(installcommand, currentWorkingDirectory, callerArguments, init_environment = init_environment, onlyErrorCaseOutput = onlyErrorCaseOutput)
def runBuildCommand(arguments = None, currentWorkingDirectory = None, callerArguments = None, init_environment = None, onlyErrorCaseOutput = False, expectedExitCodes=[0]):
if init_environment is None: