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

fix file attributes changed detection

Browse source 
https://docs.python.org/2/library/stdtypes.html#str.split
str.split([sep[, maxsplit]])
If sep is given, consecutive delimiters are not grouped together and are deemed
to delimit empty strings.

>>> "85563      ----------------C-- /var/lib/libvirt/images".split(' ')[0:2]
['85563', '']
>>> "85563      ----------------C-- /var/lib/libvirt/images".split()[0:2]
['85563', '----------------C--']
This commit is contained in:
Maxime de Roucy 2016-12-03 17:48:51 +01:00 committed by Toshio Kuratomi
parent 82cd5ffa1d
commit c2ac9d0831
2 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/ansible/module_utils/basic.py
View file

@ -1278,9 +1278,8 @@ class AnsibleModule(object):
if rc != 0 or err: if rc != 0 or err:
raise Exception("Error while setting attributes: %s" % (out + err)) raise Exception("Error while setting attributes: %s" % (out + err))
except Exception as e: except Exception as e:
path = to_text(b_path) self.fail_json(path=to_text(b_path), msg='chattr failed',
self.fail_json(path=path, msg='chattr failed', details=to_native(e), details=to_native(e), exception=traceback.format_exc())
exception=traceback.format_exc())
return changed return changed
def get_file_attributes(self, path): def get_file_attributes(self, path):
@ -1291,7 +1290,7 @@ class AnsibleModule(object):
try: try:
rc, out, err = self.run_command(attrcmd) rc, out, err = self.run_command(attrcmd)
if rc == 0: if rc == 0:
res = out.split(' ')[0:2] res = out.split()
output['attr_flags'] = res[1].replace('-', '').strip() output['attr_flags'] = res[1].replace('-', '').strip()
output['version'] = res[0].strip() output['version'] = res[0].strip()
output['attributes'] = format_attributes(output['attr_flags']) output['attributes'] = format_attributes(output['attr_flags'])
@ -2391,8 +2390,7 @@ class AnsibleModule(object):
# Set the attributes # Set the attributes
current_attribs = self.get_file_attributes(src) current_attribs = self.get_file_attributes(src)
current_attribs = current_attribs.get('attr_flags', []) current_attribs = current_attribs.get('attr_flags', '')
current_attribs = ''.join(current_attribs)
self.set_attributes_if_different(dest, current_attribs, True) self.set_attributes_if_different(dest, current_attribs, True)
def atomic_move(self, src, dest, unsafe_writes=False): def atomic_move(self, src, dest, unsafe_writes=False):

16
test/integration/targets/file/tasks/main.yml
View file

@ -62,6 +62,22 @@
- "file4_result.changed == true" - "file4_result.changed == true"
- "file4_result.mode == '0600'" - "file4_result.mode == '0600'"
- name: change file attribute "A"
file: path={{output_dir}}/baz.txt attributes=A
register: file_attributes_result
ignore_errors: True
- name: reapply file attribute "A"
file: path={{output_dir}}/baz.txt attributes=A
register: file_attributes_result_2
when: file_attributes_result is changed
- name: verify that the file was not marked as changed
assert:
that:
- "file_attributes_result_2 is not changed"
when: file_attributes_result is changed
- name: change ownership and group - name: change ownership and group
file: path={{output_dir}}/baz.txt owner=1234 group=1234 file: path={{output_dir}}/baz.txt owner=1234 group=1234