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

workers for compare for #277

Browse Source
This commit is contained in:
deadc0de6
2020-11-20 21:23:14 +01:00
parent cbd86fadba
commit 7a270584e5
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dotdrop/dotdrop.py
View File

@@ -19,7 +19,8 @@ from dotdrop.updater import Updater
from dotdrop.comparator import Comparator from dotdrop.comparator import Comparator
from dotdrop.importer import Importer from dotdrop.importer import Importer
from dotdrop.utils import get_tmpdir, removepath, \ from dotdrop.utils import get_tmpdir, removepath, \
uniq_list, patch_ignores, dependencies_met uniq_list, patch_ignores, dependencies_met, \
adapt_workers
from dotdrop.linktypes import LinkTypes from dotdrop.linktypes import LinkTypes
from dotdrop.exceptions import YamlException, UndefinedException from dotdrop.exceptions import YamlException, UndefinedException
@@ -278,6 +279,8 @@ def cmd_install(o):
dotfiles = o.dotfiles dotfiles = o.dotfiles
prof = o.conf.get_profile() prof = o.conf.get_profile()
adapt_workers(o, LOG)
pro_pre_actions = prof.get_pre_actions() if prof else [] pro_pre_actions = prof.get_pre_actions() if prof else []
pro_post_actions = prof.get_post_actions() if prof else [] pro_post_actions = prof.get_post_actions() if prof else []
@@ -423,6 +426,8 @@ def cmd_update(o):
paths = o.update_path paths = o.update_path
iskey = o.update_iskey iskey = o.update_iskey
adapt_workers(o, LOG)
if not paths: if not paths:
# update the entire profile # update the entire profile
if iskey: if iskey:

7
dotdrop/options.py
View File

@@ -227,13 +227,6 @@ class Options(AttrMonitor):
self.log.err('bad option for --workers') self.log.err('bad option for --workers')
sys.exit(USAGE) sys.exit(USAGE)
if self.safe and self.workers > 1:
self.log.warn('workers set to 1 when --force is not used')
self.workers = 1
if self.dry and self.workers > 1:
self.log.warn('workers set to 1 when --dry is used')
self.workers = 1
# import link default value # import link default value
self.import_link = self.link_on_import self.import_link = self.link_on_import
if self.args['--link']: if self.args['--link']:

9
dotdrop/utils.py
View File

@@ -331,3 +331,12 @@ def chmod(path, mode, debug=False):
LOG.dbg('chmod {} {}'.format(oct(mode), path)) LOG.dbg('chmod {} {}'.format(oct(mode), path))
os.chmod(path, mode) os.chmod(path, mode)
return get_file_perm(path) == mode return get_file_perm(path) == mode
def adapt_workers(options, logger):
if options.safe and options.workers > 1:
logger.warn('workers set to 1 when --force is not used')
options.workers = 1
if options.dry and options.workers > 1:
logger.warn('workers set to 1 when --dry is used')
options.workers = 1