diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-02-12 16:02:24 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-02-14 15:12:49 -0500 |
| commit | 3a0618331e009439ce6b9c664915669884cd4aed (patch) | |
| tree | 48849e204370f1eab8861ae9fa518404592efcc7 /src/lib/Bcfg2/Client/Tools/Action.py | |
| parent | dc22e36574d4d4cdbde282906ef3e1d3c7fe7c94 (diff) | |
| download | bcfg2-3a0618331e009439ce6b9c664915669884cd4aed.tar.gz bcfg2-3a0618331e009439ce6b9c664915669884cd4aed.tar.bz2 bcfg2-3a0618331e009439ce6b9c664915669884cd4aed.zip | |
better Executor class for client tools
Diffstat (limited to 'src/lib/Bcfg2/Client/Tools/Action.py')
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/Action.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/Action.py b/src/lib/Bcfg2/Client/Tools/Action.py index d5caf3231..7e8366928 100644 --- a/src/lib/Bcfg2/Client/Tools/Action.py +++ b/src/lib/Bcfg2/Client/Tools/Action.py @@ -48,14 +48,11 @@ class Action(Bcfg2.Client.Tools.Tool): "to build mode" % entry.get('command')) return False self.logger.debug("Running Action %s" % (entry.get('name'))) - rv = self.cmd.run(entry.get('command'))[0] + rv = self.cmd.run(entry.get('command')) self.logger.debug("Action: %s got return code %s" % - (entry.get('command'), rv)) - entry.set('rc', str(rv)) - if entry.get('status', 'check') == 'ignore': - return True - else: - return rv == 0 + (entry.get('command'), rv.retval)) + entry.set('rc', str(rv.retval)) + return entry.get('status', 'check') == 'ignore' or rv.success else: self.logger.debug("In dryrun mode: not running action: %s" % (entry.get('name'))) |