# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: mail@martinarrieta.me-20140505124621-65nohmmith56nual # target_branch: bzr+ssh://bazaar.launchpad.net/+branch/mysql-fabric/ # testament_sha1: b78c340b0ce4e1cfafb337f53d5dd592a0cf2bf5 # timestamp: 2014-05-14 10:48:48 -0300 # base_revision_id: alfranio.correia@oracle.com-20140325064735-\ # a2p778b798s45b8z # # Begin patch === modified file 'lib/mysql/fabric/command.py' --- lib/mysql/fabric/command.py 2014-03-07 06:36:46 +0000 +++ lib/mysql/fabric/command.py 2014-05-05 12:46:21 +0000 @@ -354,7 +354,13 @@ :param args: The arguments for the command dispatch. """ status = self.client.dispatch(self, *args) - return self.command_status(status) + + if isinstance(status[0], bool): + exitstatus = status[0] + else: + exitstatus = False + + return (exitstatus, self.command_status(status)) @staticmethod def command_status(status, details=False): @@ -495,7 +501,12 @@ :param args: The arguments for the command dispatch. """ status = self.client.dispatch(self, *args) - return self.procedure_status(status) + if isinstance(status[0], bool): + exitstatus = status[0] + else: + exitstatus = False + + return (exitstatus, self.procedure_status(status)) @staticmethod def wait_for_procedures(procedure_param, synchronous): === modified file 'scripts/mysqlfabric.py' (properties changed: -x to +x) --- scripts/mysqlfabric.py 2014-03-07 06:36:46 +0000 +++ scripts/mysqlfabric.py 2014-05-04 23:06:30 +0000 @@ -17,6 +17,7 @@ # import os +import sys import inspect import textwrap from getpass import getpass @@ -337,12 +338,21 @@ command.group_name, command.command_name, ) ) - + + #Default exit code is 1 (false) + exitcode = 1 + # Execute command by dispatching it on the client side. Append the #optional arguments passed by the user to the argument list. - result = command.dispatch(*(command.append_options_to_args(args))) + exitstatus, result = command.dispatch(*(command.append_options_to_args(args))) if result is not None: print result + + if exitstatus: + exitcode = 0 + + sys.exit(exitcode) + except TypeError: PARSER.error( "Wrong number of parameters were provided for command '{group} " # Begin bundle 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 THAYlEnBprOmYdZs9Bmm7n/F3JFOFCQvcmtXgA==