mirrors/dotdrop
1
0
Fork 0
mirror of https://github.com/deadc0de6/dotdrop.git synced 2026-02-11 05:34:17 +00:00
Code Activity

adapt question to user for mode change

Browse Source
This commit is contained in:
deadc0de6
2020-11-15 10:58:46 +01:00
parent 908a006adc
commit a3c6abd32b
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dotdrop/installer.py
View File

@@ -578,6 +578,10 @@ class Installer:
# broken symlink # broken symlink
err = 'broken symlink {}'.format(dst) err = 'broken symlink {}'.format(dst)
return -1, err return -1, err
if self.debug:
d = 'src mode {:o}, dst mode {:o}'
self.log.dbg(d.format(rights, dstrights))
diff = None diff = None
if self.diff: if self.diff:
diff = self._diff_before_write(src, dst, diff = self._diff_before_write(src, dst,
@@ -748,15 +752,17 @@ class Installer:
return True return True
if not os.path.exists(src): if not os.path.exists(src):
return True return True
cperms = utils.get_file_perm(src) sperms = utils.get_file_perm(src)
perms = utils.get_file_perm(dst) dperms = utils.get_file_perm(dst)
if perms == cperms: if sperms == dperms:
return True return True
elif self.safe: elif self.safe:
# this only happens if no
# chmod is provided
# and dst/src modes differ
if self.safe: if self.safe:
msg = 'Mode differs ({:o} and {:o} ({})' msg = 'Set mode {:o} to \"{}\"'
msg = msg.format(cperms, perms, dst) msg = msg.format(sperms, dst)
msg += ', continue'
if not self.log.ask(msg): if not self.log.ask(msg):
return False return False
return True return True