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 14:57:04 -0500 |
| commit | 43984bc5ebc59bd8c5890ed6ba3de162e6698dcc (patch) | |
| tree | d9e972b160d5d5033537495e9f507cfe043483c3 /src/lib/Bcfg2/Client/Tools/Action.py | |
| parent | d526c8745b61c1977b775cfe750a86c51dd6a9f3 (diff) | |
| download | bcfg2-43984bc5ebc59bd8c5890ed6ba3de162e6698dcc.tar.gz bcfg2-43984bc5ebc59bd8c5890ed6ba3de162e6698dcc.tar.bz2 bcfg2-43984bc5ebc59bd8c5890ed6ba3de162e6698dcc.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 b1a897c81..87565d96d 100644 --- a/src/lib/Bcfg2/Client/Tools/Action.py +++ b/src/lib/Bcfg2/Client/Tools/Action.py @@ -49,14 +49,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'))) |