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

archive: Fix check if archive is created in path to be removed (#29420) (#49444)

Browse source 
* archive: Fix check if archive is created in path to be removed (#29420)

(cherry picked from commit 3a45de4209)

* add changelog
This commit is contained in:
feranwq 2019-01-19 04:41:23 +08:00 committed by Toshio Kuratomi
parent 80b5b33e2b
commit f2d4187761
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/49444_fix_check_if_archive_is_created_in_path_to_be_removed.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- archive - Fix check if archive is created in path to be removed

9
lib/ansible/modules/files/archive.py
View file

@ -261,8 +261,13 @@ def main():
arcroot += os.sep
# Don't allow archives to be created anywhere within paths to be removed
if remove and os.path.isdir(path) and dest.startswith(path):
module.fail_json(path=', '.join(paths), msg='Error, created archive can not be contained in source paths when remove=True')
if remove and os.path.isdir(path):
path_dir = path
if path[-1] != '/':
path_dir += '/'
if dest.startswith(path_dir):
module.fail_json(path=', '.join(paths), msg='Error, created archive can not be contained in source paths when remove=True')
if os.path.lexists(path) and path not in expanded_exclude_paths:
archive_paths.append(path)