1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00

Merge pull request #4470 from jyap808/patch-1

Assume state='directory' if recurse is set and previous state was 'direc...
This commit is contained in:
jctanner 2013-10-14 13:49:35 -07:00
commit 79071aee79

View file

@ -200,9 +200,14 @@ def main():
elif os.stat(path).st_nlink > 1: elif os.stat(path).st_nlink > 1:
prev_state = 'hard' prev_state = 'hard'
else: else:
# could be many other tings, but defaulting to file # could be many other things, but defaulting to file
prev_state = 'file' prev_state = 'file'
recurse = params['recurse']
if recurse and state == 'file' and prev_state == 'directory':
state = 'directory'
if prev_state != 'absent' and state == 'absent': if prev_state != 'absent' and state == 'absent':
try: try:
if prev_state == 'directory': if prev_state == 'directory':
@ -248,7 +253,6 @@ def main():
changed = True changed = True
changed = module.set_directory_attributes_if_different(file_args, changed) changed = module.set_directory_attributes_if_different(file_args, changed)
recurse = params['recurse']
if recurse: if recurse:
for root,dirs,files in os.walk( file_args['path'] ): for root,dirs,files in os.walk( file_args['path'] ):
for dir in dirs: for dir in dirs: