Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

merge conflicts

Browse source
This commit is contained in:
Jack 2016-05-06 15:42:21 -04:00
parent da31520465
commit da9b1b3f58
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lbrynet/lbrynet_daemon/LBRYDaemonServer.py
View file

@ -1,5 +1,4 @@
import logging import logging
import subprocess
import os import os
import shutil import shutil
import json import json
@ -273,11 +272,13 @@ class LBRYDaemonServer(object):
return defer.succeed("user-specified") return defer.succeed("user-specified")
else: else:
log.info("User specified UI directory doesn't exist, using " + branch) log.info("User specified UI directory doesn't exist, using " + branch)
elif branch == "HEAD":
log.info("Using UI branch: " + branch)
self._git_url = "https://api.github.com/repos/lbryio/lbry-web-ui/git/refs/heads/master"
self._dist_url = "https://raw.githubusercontent.com/lbryio/lbry-web-ui/master/dist.zip"
else: else:
log.info("Using UI branch: " + branch) log.info("Using UI branch: " + branch)
if branch == "HEAD": self._git_url = "https://api.github.com/repos/lbryio/lbry-web-ui/git/refs/heads/%s" % branch
branch = "master"
self._git_url = "https://api.github.com/repos/lbryio/lbry.io/git/refs/heads/%s" % branch
self._dist_url = "https://raw.githubusercontent.com/lbryio/lbry-web-ui/%s/dist.zip" % branch self._dist_url = "https://raw.githubusercontent.com/lbryio/lbry-web-ui/%s/dist.zip" % branch
d = self._up_to_date() d = self._up_to_date()