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/Upstart.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/Upstart.py')
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/Upstart.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/Upstart.py b/src/lib/Bcfg2/Client/Tools/Upstart.py index 02ed52544..cd1c4a2bc 100644 --- a/src/lib/Bcfg2/Client/Tools/Upstart.py +++ b/src/lib/Bcfg2/Client/Tools/Upstart.py @@ -39,7 +39,8 @@ class Upstart(Bcfg2.Client.Tools.SvcTool): try: output = self.cmd.run('/usr/sbin/service %s status %s' % - (entry.get('name'), params))[1][0] + (entry.get('name'), + params)).stdout.splitlines()[0] except IndexError: self.logger.error("Service %s not an Upstart service" % entry.get('name')) @@ -71,11 +72,10 @@ class Upstart(Bcfg2.Client.Tools.SvcTool): def InstallService(self, entry): """Install Service for entry.""" if entry.get('status') == 'on': - pstatus = self.cmd.run(self.get_svc_command(entry, 'start'))[0] + cmd = "start" elif entry.get('status') == 'off': - pstatus = self.cmd.run(self.get_svc_command(entry, 'stop'))[0] - # pstatus is true if command failed - return not pstatus + cmd = "stop" + return self.cmd.run(self.get_svc_command(entry, cmd)).success def FindExtra(self): """Locate extra Upstart services.""" |