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

add boost on gitlab, fix failing test, add libtorrent to linux build

Browse source
This commit is contained in:
Victor Shyba 2020-02-24 18:08:41 -03:00
parent 6d83f7e7bd
commit ce7a985df6
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.gitlab-ci.yml
View file

@ -40,6 +40,8 @@ test:unit:
test:datanetwork-integration: test:datanetwork-integration:
stage: test stage: test
script: script:
- apt-get update
- apt-get install -y libboost1.65-all-dev
- pip install tox-travis - pip install tox-travis
- tox -e datanetwork - tox -e datanetwork
@ -92,8 +94,9 @@ build:linux:
- apt-get install -y --no-install-recommends software-properties-common zip curl build-essential - apt-get install -y --no-install-recommends software-properties-common zip curl build-essential
- add-apt-repository -y ppa:deadsnakes/ppa - add-apt-repository -y ppa:deadsnakes/ppa
- apt-get update - apt-get update
- apt-get install -y --no-install-recommends python3.7-dev - apt-get install -y --no-install-recommends python3.7-dev libboost1.65-all-dev
- python3.7 <(curl -q https://bootstrap.pypa.io/get-pip.py) # make sure we get pip with python3.7 - python3.7 <(curl -q https://bootstrap.pypa.io/get-pip.py) # make sure we get pip with python3.7
- pip install https://s3.amazonaws.com/files.lbry.io/python_libtorrent-1.2.4-py3-none-any.whl # temporarly only on linux
build:mac: build:mac:
extends: .build extends: .build

3
lbry/extras/daemon/daemon.py
View file

@ -3451,7 +3451,8 @@ class Daemon(metaclass=JSONRPCServerType):
stream_hash = None stream_hash = None
if not preview: if not preview:
old_stream = self.file_manager.get_filtered(sd_hash=old_txo.claim.stream.source.sd_hash)[0] old_stream = self.file_manager.get_filtered(sd_hash=old_txo.claim.stream.source.sd_hash)
old_stream = old_stream[0] if old_stream else None
if file_path is not None: if file_path is not None:
if old_stream: if old_stream:
await self.file_manager.delete(old_stream, delete_file=False) await self.file_manager.delete(old_stream, delete_file=False)