1
0
mirror of https://github.com/deadc0de6/dotdrop.git synced 2026-02-10 09:14:16 +00:00

fix concurrent

This commit is contained in:
deadc0de6
2020-11-08 14:13:19 +01:00
parent a766874653
commit ce98e75bf1

View File

@@ -72,7 +72,10 @@ def action_executor(o, actions, defactions, templater, post=False):
def _dotfile_install(o, dotfile, tmpdir=None): def _dotfile_install(o, dotfile, tmpdir=None):
"""install a dotfile""" """
install a dotfile
returns <success, dotfile key, err>
"""
# installer # installer
inst = _get_install_installer(o, tmpdir=tmpdir) inst = _get_install_installer(o, tmpdir=tmpdir)
@@ -186,7 +189,7 @@ def cmd_install(o):
return False return False
# install each dotfile # install each dotfile
if o.install_parallel: if o.install_parallel > 1:
# in parallel # in parallel
ex = futures.ThreadPoolExecutor(max_workers=INST_WORKERS) ex = futures.ThreadPoolExecutor(max_workers=INST_WORKERS)
@@ -204,11 +207,11 @@ def cmd_install(o):
else: else:
# sequentially # sequentially
for dotfile in dotfiles: for dotfile in dotfiles:
r, err = _dotfile_install(o, dotfile, tmpdir=tmpdir) r, key, err = _dotfile_install(o, dotfile, tmpdir=tmpdir)
if r: if r:
installed += 1 installed += 1
elif err: elif err:
LOG.err('installing \"{}\" failed: {}'.format(dotfile.key, LOG.err('installing \"{}\" failed: {}'.format(key,
err)) err))
# execute profile post-action # execute profile post-action
@@ -221,7 +224,7 @@ def cmd_install(o):
return False return False
if o.debug: if o.debug:
LOG.dbg('install done') LOG.dbg('install done - {} installed'.format(installed))
if o.install_temporary: if o.install_temporary:
LOG.log('\ninstalled to tmp \"{}\".'.format(tmpdir)) LOG.log('\ninstalled to tmp \"{}\".'.format(tmpdir))