summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSol Jerome <solj@ices.utexas.edu>2010-03-19 03:04:05 +0000
committerSol Jerome <solj@ices.utexas.edu>2010-03-18 22:04:25 -0500
commit424d355b48b7dccdb345f1f9ff7afe506e4388c8 (patch)
tree0dd8ddfef1a0f5b9f86dce3e286d77bd6e27bca8 /src
parent1aa352a48cf606c379da3e038c94b24b9c55eb56 (diff)
downloadbcfg2-424d355b48b7dccdb345f1f9ff7afe506e4388c8.tar.gz
bcfg2-424d355b48b7dccdb345f1f9ff7afe506e4388c8.tar.bz2
bcfg2-424d355b48b7dccdb345f1f9ff7afe506e4388c8.zip
Upstart: Properly verify service status
Signed-off-by: Sol Jerome <solj@ices.utexas.edu> git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5781 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src')
-rw-r--r--src/lib/Client/Tools/Upstart.py12
-rw-r--r--src/lib/Client/Tools/debsums.py11
2 files changed, 19 insertions, 4 deletions
diff --git a/src/lib/Client/Tools/Upstart.py b/src/lib/Client/Tools/Upstart.py
index a3da5b514..43a51fd79 100644
--- a/src/lib/Client/Tools/Upstart.py
+++ b/src/lib/Client/Tools/Upstart.py
@@ -32,13 +32,17 @@ class Upstart(Bcfg2.Client.Tools.SvcTool):
output = self.cmd.run('/usr/sbin/service %s status' % \
entry.get('name'))[1][0]
if output.split(' ')[1].split('/')[1].startswith('running'):
- status = True
+ entry.set('current_status', 'on')
if entry.get('status') == 'off':
- entry.set('current_status', 'on')
+ status = False
+ else:
+ status = True
else:
- status = False
+ entry.set('current_status', 'off')
if entry.get('status') == 'on':
- entry.set('current_status', 'off')
+ status = False
+ else:
+ status = True
return status
diff --git a/src/lib/Client/Tools/debsums.py b/src/lib/Client/Tools/debsums.py
new file mode 100644
index 000000000..bcc25d5a7
--- /dev/null
+++ b/src/lib/Client/Tools/debsums.py
@@ -0,0 +1,11 @@
+#!/usr/bin/python
+"""
+ This provides bcfg2 support for debsums
+"""
+__revision__ = '$Revision$'
+
+import apt.cache
+import os
+import Bcfg2.Client.Tools
+
+