cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Swapped conditions of the changed if statements

Browse source
This commit is contained in:
Jasper N. Brouwer 2013-12-23 09:54:16 +01:00
parent 677f95294e
commit 9dab01c5e2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
system/service
View file

@ -431,10 +431,10 @@ class LinuxService(Service):
if check_systemd(self.name): if check_systemd(self.name):
# service is managed by systemd # service is managed by systemd
self.enable_cmd = location['systemctl'] self.enable_cmd = location['systemctl']
elif os.path.exists("/etc/init/%s.conf" % self.name) and location['initctl']: elif location['initctl'] and os.path.exists("/etc/init/%s.conf" % self.name):
# service is managed by upstart # service is managed by upstart
self.enable_cmd = location['initctl'] self.enable_cmd = location['initctl']
elif os.path.exists("/etc/init.d/%s" % self.name) and location['update-rc.d']: elif location['update-rc.d'] and os.path.exists("/etc/init.d/%s" % self.name):
# service is managed by with SysV init scripts, but with update-rc.d # service is managed by with SysV init scripts, but with update-rc.d
self.enable_cmd = location['update-rc.d'] self.enable_cmd = location['update-rc.d']
else: else: