mirrors/dotdrop
1
0
Fork 0
mirror of https://github.com/deadc0de6/dotdrop.git synced 2026-02-08 22:29:18 +00:00
Code Activity

fix chmod compare bug

Browse Source
This commit is contained in:
deadc0de6
2022-05-26 21:13:39 +02:00
committed by deadc0de
parent 93e33a4d9a
commit 8938cbd602
5 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
dotdrop/comparator.py
View File

@@ -28,9 +28,12 @@ class Comparator:
self.log = Logger(debug=self.debug)
self.ignore_missing_in_dotdrop = ignore_missing_in_dotdrop
def compare(self, local_path, deployed_path, ignore=None):
"""diff local_path (dotdrop dotfile) and
deployed_path (destination file)"""
def compare(self, local_path, deployed_path, ignore=None, mode=None):
"""
diff local_path (dotdrop dotfile) and
deployed_path (destination file)
If mode is None, rights will be read from local_path
"""
if not ignore:
ignore = []
local_path = os.path.expanduser(local_path)
@@ -58,19 +61,24 @@ class Comparator:
self.log.dbg('{} is a file'.format(local_path))
ret = self._comp_file(local_path, deployed_path, ignore)
if not ret:
ret = self._comp_mode(local_path, deployed_path)
ret = self._comp_mode(local_path, deployed_path, mode=mode)
return ret
self.log.dbg('{} is a directory'.format(local_path))
ret = self._comp_dir(local_path, deployed_path, ignore)
if not ret:
ret = self._comp_mode(local_path, deployed_path)
ret = self._comp_mode(local_path, deployed_path, mode=mode)
return ret
def _comp_mode(self, local_path, deployed_path):
"""compare mode"""
local_mode = get_file_perm(local_path)
def _comp_mode(self, local_path, deployed_path, mode=None):
"""
compare mode
If mode is None, rights will be read on local_path
"""
local_mode = mode
if not local_mode:
local_mode = get_file_perm(local_path)
deployed_mode = get_file_perm(deployed_path)
if local_mode == deployed_mode:
return ''

2
dotdrop/dotdrop.py
View File

@@ -158,7 +158,7 @@ def _dotfile_compare(opts, dotfile, tmp):
# compare
# need to be executed before cleaning
diff = comp.compare(src, dotfile.dst, ignore=ignores)
diff = comp.compare(src, dotfile.dst, ignore=ignores, mode=dotfile.chmod)
# clean tmp transformed dotfile if any
if tmpsrc: