mirror of
https://github.com/deadc0de6/dotdrop.git
synced 2026-02-15 16:50:03 +00:00
linting
This commit is contained in:
@@ -150,16 +150,12 @@ class Importer:
|
||||
self.log.sub('\"{}\" imported'.format(path))
|
||||
return 1
|
||||
|
||||
def _prepare_hierarchy(self, src, dst):
|
||||
"""prepare hierarchy for dotfile"""
|
||||
srcf = os.path.join(self.dotpath, src)
|
||||
srcfd = os.path.dirname(srcf)
|
||||
if self._ignore(srcf) or self._ignore(srcfd):
|
||||
return False
|
||||
|
||||
# a dotfile in dotpath already exists at that spot
|
||||
if os.path.exists(srcf):
|
||||
if self.safe:
|
||||
def _prepare_hier_when_exists(self, srcf, dst):
|
||||
"""a dotfile in dotpath already exists at that spot"""
|
||||
if not os.path.exists(srcf):
|
||||
return True
|
||||
if not self.safe:
|
||||
return True
|
||||
cmp = Comparator(debug=self.debug,
|
||||
diff_cmd=self.diff_cmd)
|
||||
diff = cmp.compare(srcf, dst)
|
||||
@@ -172,6 +168,17 @@ class Importer:
|
||||
if not self.log.ask(msg.format(srcf)):
|
||||
return False
|
||||
self.log.dbg('will overwrite existing file')
|
||||
return True
|
||||
|
||||
def _prepare_hierarchy(self, src, dst):
|
||||
"""prepare hierarchy for dotfile"""
|
||||
srcf = os.path.join(self.dotpath, src)
|
||||
srcfd = os.path.dirname(srcf)
|
||||
if self._ignore(srcf) or self._ignore(srcfd):
|
||||
return False
|
||||
|
||||
if not self._prepare_hier_when_exists(srcf, dst):
|
||||
return False
|
||||
|
||||
# create directory hierarchy
|
||||
if self.dry:
|
||||
|
||||
Reference in New Issue
Block a user