summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Client/Tools/Chkconfig.py
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2013-06-03 10:47:02 -0500
committerSol Jerome <sol.jerome@gmail.com>2013-06-03 10:48:17 -0500
commitb026f9b9a407a359b4d5615b1fb469f84b260218 (patch)
tree2015cca6d0cda5831d743c6637b7837a6bfaedca /src/lib/Bcfg2/Client/Tools/Chkconfig.py
parent7175d64e3b4c150340bb71363e5a25faac80e21e (diff)
downloadbcfg2-b026f9b9a407a359b4d5615b1fb469f84b260218.tar.gz
bcfg2-b026f9b9a407a359b4d5615b1fb469f84b260218.tar.bz2
bcfg2-b026f9b9a407a359b4d5615b1fb469f84b260218.zip
Services: Don't check status when set to 'ignore'
Checking the status for services that don't support it leads to ugly output in the interactive client on some platforms. Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'src/lib/Bcfg2/Client/Tools/Chkconfig.py')
-rw-r--r--src/lib/Bcfg2/Client/Tools/Chkconfig.py29
1 files changed, 15 insertions, 14 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/Chkconfig.py b/src/lib/Bcfg2/Client/Tools/Chkconfig.py
index 0f5f32302..256c28255 100644
--- a/src/lib/Bcfg2/Client/Tools/Chkconfig.py
+++ b/src/lib/Bcfg2/Client/Tools/Chkconfig.py
@@ -57,27 +57,28 @@ class Chkconfig(Bcfg2.Client.Tools.SvcTool):
return True
current_bootstatus = self.verify_bootstatus(entry, bootstatus)
- svcstatus = self.check_service(entry)
- if entry.get('status') == 'on':
- if svcstatus:
- current_srvstatus = True
- else:
- current_srvstatus = False
- elif entry.get('status') == 'off':
- if svcstatus:
- current_srvstatus = False
- else:
- current_srvstatus = True
- else:
+ if entry.get('status') == 'ignore':
# 'ignore' should verify
- current_srvstatus = True
+ current_svcstatus = True
+ else:
+ svcstatus = self.check_service(entry)
+ if entry.get('status') == 'on':
+ if svcstatus:
+ current_svcstatus = True
+ else:
+ current_svcstatus = False
+ elif entry.get('status') == 'off':
+ if svcstatus:
+ current_svcstatus = False
+ else:
+ current_svcstatus = True
if svcstatus:
entry.set('current_status', 'on')
else:
entry.set('current_status', 'off')
- return current_bootstatus and current_srvstatus
+ return current_bootstatus and current_svcstatus
def InstallService(self, entry):
"""Install Service entry."""