From 258025085e8d4a0e4129bf1d2dd36ed7ac8786b2 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Thu, 29 Apr 2010 16:31:15 +0000 Subject: Upstart: Fix traceback for non-upstart services (Resolves Ticket #878) Signed-off-by: Sol Jerome git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5847 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Client/Tools/Upstart.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/lib/Client/Tools/Upstart.py b/src/lib/Client/Tools/Upstart.py index 1fc80a1db..b6e68d549 100644 --- a/src/lib/Client/Tools/Upstart.py +++ b/src/lib/Client/Tools/Upstart.py @@ -29,8 +29,13 @@ class Upstart(Bcfg2.Client.Tools.SvcTool): /etc/init/servicename.conf. All we need to do is make sure the service is running when it should be. ''' - output = self.cmd.run('/usr/sbin/service %s status' % \ - entry.get('name'))[1][0] + try: + output = self.cmd.run('/usr/sbin/service %s status' % \ + entry.get('name'))[1][0] + except IndexError: + self.logger.error("Service %s not an Upstart service" % \ + entry.get('name')) + return False try: running = output.split(' ')[1].split('/')[1].startswith('running') if running: -- cgit v1.2.3-1-g7c22