mirrors/dotdrop
1
0
Fork 0
mirror of https://github.com/deadc0de6/dotdrop.git synced 2026-02-10 12:44:15 +00:00
Code Activity

better error message and fix bug when create=False with compare

Browse Source
This commit is contained in:
deadc0de6
2018-02-05 16:31:37 +01:00
parent be00934148
commit e72cd3aa1e
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dotdrop/installer.py
View File

@@ -71,12 +71,12 @@ class Installer:
self.log.err('generate from template \"%s\"' % (src)) self.log.err('generate from template \"%s\"' % (src))
return [] return []
if not os.path.exists(src): if not os.path.exists(src):
self.log.err('installing %s to %s' % (src, dst)) self.log.err('source dotfile does not exist: \"%s\"' % (src))
return [] return []
st = os.stat(src) st = os.stat(src)
ret = self._write(dst, content, st.st_mode) ret = self._write(dst, content, st.st_mode)
if ret < 0: if ret < 0:
self.log.err('installing %s to %s' % (src, dst)) self.log.err('installing \"%s\" to \"%s\"' % (src, dst))
return [] return []
if ret > 0: if ret > 0:
if not self.quiet: if not self.quiet:
@@ -84,7 +84,7 @@ class Installer:
return [] return []
if ret == 0: if ret == 0:
if not self.dry and not self.comparing: if not self.dry and not self.comparing:
self.log.sub('copied %s to %s' % (src, dst)) self.log.sub('copied \"%s\" to \"%s\"' % (src, dst))
return [(src, dst)] return [(src, dst)]
return [] return []
@@ -125,7 +125,7 @@ class Installer:
self._backup(dst) self._backup(dst)
base = os.path.dirname(dst) base = os.path.dirname(dst)
if not self._create_dirs(base): if not self._create_dirs(base):
self.log.err('creating directory for %s' % (dst)) self.log.err('creating directory for \"%s\"' % (dst))
return -1 return -1
with open(dst, 'wb') as f: with open(dst, 'wb') as f:
f.write(content) f.write(content)
@@ -165,6 +165,8 @@ class Installer:
self.dry = False self.dry = False
diffsaved = self.diff diffsaved = self.diff
self.diff = False self.diff = False
createsaved = self.create
self.create = True
src = os.path.expanduser(src) src = os.path.expanduser(src)
dst = os.path.expanduser(dst) dst = os.path.expanduser(dst)
if not os.path.exists(dst): if not os.path.exists(dst):
@@ -184,4 +186,5 @@ class Installer:
self.dry = drysaved self.dry = drysaved
self.diff = diffsaved self.diff = diffsaved
self.comparing = False self.comparing = False
self.create = createsaved
return retval return retval