LBRYFoundation/lbry-sdk
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/lbry-sdk.git synced 2025-08-23 17:27:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Give priority to arguments over settings in UIManager.setup()

Browse source
This commit is contained in:
Alex Liebowitz 2016-11-16 15:58:11 -05:00
parent 0941618048
commit 8b1ea0a6a7
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lbrynet/lbrynet_daemon/UIManager.py
View file

@ -61,9 +61,12 @@ class UIManager(object):
self.loaded_requirements = None self.loaded_requirements = None
def setup(self, branch=None, check_requirements=None, user_specified=None): def setup(self, branch=None, check_requirements=None, user_specified=None):
local_ui_path = settings.local_ui_path or user_specified local_ui_path = (user_specified if user_specified is not None
self.branch = settings.ui_branch or branch else settings.local_ui_path)
self.check_requirements = settings.check_ui_requirements or check_requirements self.branch = branch if branch is not None else settings.ui_branch
self.check_requirements = (check_requirements if check_requirements is not None
else settings.check_ui_requirements)
if self._check_for_bundled_ui(): if self._check_for_bundled_ui():
return defer.succeed(True) return defer.succeed(True)