internet/community.crypto
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.crypto.git synced 2026-05-06 13:22:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pass absolute paths to atmoic_move(). (#799)

Browse Source
This commit is contained in:
Felix Fontein
2024-10-01 21:55:00 +03:00
committed by GitHub
parent 5a2dff7b74
commit db871c2686
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/module_utils/openssh/backends/common.py
View File

@@ -28,7 +28,7 @@ def restore_on_failure(f):
f(module, path, *args, **kwargs)
except Exception:
if backup_file is not None:
module.atomic_move(backup_file, path)
module.atomic_move(os.path.abspath(backup_file), os.path.abspath(path))
raise
else:
module.add_cleanup_file(backup_file)
@@ -38,7 +38,7 @@ def restore_on_failure(f):
@restore_on_failure
def safe_atomic_move(module, path, destination):
module.atomic_move(path, destination)
module.atomic_move(os.path.abspath(path), os.path.abspath(destination))
def _restore_all_on_failure(f):
@@ -49,7 +49,7 @@ def _restore_all_on_failure(f):
f(self, sources_and_destinations, *args, **kwargs)
except Exception:
for destination, backup in backups:
self.module.atomic_move(backup, destination)
self.module.atomic_move(os.path.abspath(backup), os.path.abspath(destination))
raise
else:
for destination, backup in backups:
@@ -138,7 +138,7 @@ class OpensshModule(object):
"""
for source, destination in sources_and_destinations:
if os.path.exists(destination):
self.module.atomic_move(source, destination)
self.module.atomic_move(os.path.abspath(source), os.path.abspath(destination))
else:
self.module.preserved_copy(source, destination)