mirror of
https://github.com/deadc0de6/dotdrop.git
synced 2026-02-15 20:50:05 +00:00
fix installing directory dotfile
This commit is contained in:
@@ -273,7 +273,8 @@ class Installer:
|
|||||||
if self.debug:
|
if self.debug:
|
||||||
self.log.dbg('install dir {}'.format(src))
|
self.log.dbg('install dir {}'.format(src))
|
||||||
self.log.dbg('ignore empty: {}'.format(noempty))
|
self.log.dbg('ignore empty: {}'.format(noempty))
|
||||||
ret = True, None
|
# default to nothing installed and no error
|
||||||
|
ret = False, None
|
||||||
if not self._create_dirs(dst):
|
if not self._create_dirs(dst):
|
||||||
err = 'creating directory for {}'.format(dst)
|
err = 'creating directory for {}'.format(dst)
|
||||||
return False, err
|
return False, err
|
||||||
@@ -281,21 +282,31 @@ class Installer:
|
|||||||
for entry in os.listdir(src):
|
for entry in os.listdir(src):
|
||||||
f = os.path.join(src, entry)
|
f = os.path.join(src, entry)
|
||||||
if not os.path.isdir(f):
|
if not os.path.isdir(f):
|
||||||
|
# is file
|
||||||
res, err = self._handle_file(templater, f,
|
res, err = self._handle_file(templater, f,
|
||||||
os.path.join(dst, entry),
|
os.path.join(dst, entry),
|
||||||
actions=actions,
|
actions=actions,
|
||||||
noempty=noempty)
|
noempty=noempty)
|
||||||
if not res and err:
|
if not res and err:
|
||||||
|
# error occured
|
||||||
ret = res, err
|
ret = res, err
|
||||||
break
|
break
|
||||||
|
elif res:
|
||||||
|
# something got installed
|
||||||
|
ret = True, None
|
||||||
else:
|
else:
|
||||||
|
# is directory
|
||||||
res, err = self._handle_dir(templater, f,
|
res, err = self._handle_dir(templater, f,
|
||||||
os.path.join(dst, entry),
|
os.path.join(dst, entry),
|
||||||
actions=actions,
|
actions=actions,
|
||||||
noempty=noempty)
|
noempty=noempty)
|
||||||
if not res and err:
|
if not res and err:
|
||||||
|
# error occured
|
||||||
ret = res, err
|
ret = res, err
|
||||||
break
|
break
|
||||||
|
elif res:
|
||||||
|
# something got installed
|
||||||
|
ret = True, None
|
||||||
return ret
|
return ret
|
||||||
|
|
||||||
def _fake_diff(self, dst, content):
|
def _fake_diff(self, dst, content):
|
||||||
|
|||||||
Reference in New Issue
Block a user