mirrors/dotdrop
1
0
Fork 0
mirror of https://github.com/deadc0de6/dotdrop.git synced 2026-02-09 21:39:16 +00:00
Code Activity

fix chmod

Browse Source
This commit is contained in:
deadc0de6
2020-11-14 15:02:39 +01:00
parent 87b70053c8
commit 2f17d36ffb
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dotdrop/installer.py
View File

@@ -53,7 +53,6 @@ class Installer:
self.backup_suffix = backup_suffix self.backup_suffix = backup_suffix
self.diff_cmd = diff_cmd self.diff_cmd = diff_cmd
self.action_executed = False self.action_executed = False
self.umask = utils.get_umask()
# avoids printing file copied logs # avoids printing file copied logs
# when using install_to_tmp for comparing # when using install_to_tmp for comparing
self.comparing = False self.comparing = False
@@ -588,7 +587,7 @@ class Installer:
if self.debug: if self.debug:
self.log.dbg('{} is the same'.format(dst)) self.log.dbg('{} is the same'.format(dst))
return 1, None return 1, None
if self.safe: if diff and self.safe:
if self.debug: if self.debug:
self.log.dbg('change detected for {}'.format(dst)) self.log.dbg('change detected for {}'.format(dst))
if self.showdiff: if self.showdiff:
@@ -739,7 +738,10 @@ class Installer:
return boolean, err return boolean, err
def _check_chmod(self, src, dst, chmod): def _check_chmod(self, src, dst, chmod):
"""check chmod needs change""" """
check chmod needs change
returns True to continue installation
"""
if chmod: if chmod:
return True return True
if not os.path.exists(dst): if not os.path.exists(dst):
@@ -750,11 +752,10 @@ class Installer:
perms = utils.get_file_perm(dst) perms = utils.get_file_perm(dst)
if perms == cperms: if perms == cperms:
return True return True
if perms & self.umask: elif self.safe:
# perms and umask differ
if self.safe: if self.safe:
msg = 'File mode ({}) differs from umask ({})' msg = 'Mode differs ({:o} and {:o} ({})'
msg.format(perms, self.umask) msg = msg.format(cperms, perms, dst)
msg += ', continue' msg += ', continue'
if not self.log.ask(msg): if not self.log.ask(msg):
return False return False