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

Merge pull request #8788 from eest/service-service_enable_rcconf-changed

Browse source 
service: use self.changed in service_enable_rcconf().
This commit is contained in:
James Cammarata 2014-09-02 10:29:41 -05:00
commit af2a6b4571
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
system/service
View file

@ -317,7 +317,7 @@ class Service(object):
if self.rcconf_file is None or self.rcconf_key is None or self.rcconf_value is None: if self.rcconf_file is None or self.rcconf_key is None or self.rcconf_value is None:
self.module.fail_json(msg="service_enable_rcconf() requires rcconf_file, rcconf_key and rcconf_value") self.module.fail_json(msg="service_enable_rcconf() requires rcconf_file, rcconf_key and rcconf_value")
changed = None self.changed = None
entry = '%s="%s"\n' % (self.rcconf_key, self.rcconf_value) entry = '%s="%s"\n' % (self.rcconf_key, self.rcconf_value)
RCFILE = open(self.rcconf_file, "r") RCFILE = open(self.rcconf_file, "r")
new_rc_conf = [] new_rc_conf = []
@ -331,12 +331,12 @@ class Service(object):
if key == self.rcconf_key: if key == self.rcconf_key:
if value.upper() == self.rcconf_value: if value.upper() == self.rcconf_value:
# Since the proper entry already exists we can stop iterating. # Since the proper entry already exists we can stop iterating.
changed = False self.changed = False
break break
else: else:
# We found the key but the value is wrong, replace with new entry. # We found the key but the value is wrong, replace with new entry.
rcline = entry rcline = entry
changed = True self.changed = True
# Add line to the list. # Add line to the list.
new_rc_conf.append(rcline) new_rc_conf.append(rcline)
@ -345,11 +345,11 @@ class Service(object):
RCFILE.close() RCFILE.close()
# If we did not see any trace of our entry we need to add it. # If we did not see any trace of our entry we need to add it.
if changed is None: if self.changed is None:
new_rc_conf.append(entry) new_rc_conf.append(entry)
changed = True self.changed = True
if changed is True: if self.changed is True:
if self.module.check_mode: if self.module.check_mode:
self.module.exit_json(changed=True, msg="changing service enablement") self.module.exit_json(changed=True, msg="changing service enablement")