LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Projects Releases 282 Packages Wiki Activity

Merge pull request #272 from lbryio/setup-ui-defaults

Browse source 
Give priority to arguments over settings in UIManager.setup()
This commit is contained in:
Jack Robison 2016-11-16 18:53:26 -05:00 committed by GitHub
commit 0490250da4
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lbrynet/lbrynet_daemon/UIManager.py
View file

@ -61,9 +61,11 @@ 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 or settings.local_ui_path
self.branch = settings.ui_branch or branch
self.check_requirements = settings.check_ui_requirements or check_requirements self.branch = branch or 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)