From ce7a985df6d3eb4ca12f6c26b193e1267c3aea32 Mon Sep 17 00:00:00 2001 From: Victor Shyba Date: Mon, 24 Feb 2020 18:08:41 -0300 Subject: [PATCH] add boost on gitlab, fix failing test, add libtorrent to linux build --- .gitlab-ci.yml | 5 ++++- lbry/extras/daemon/daemon.py | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ea24541b9..822301f64 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,6 +40,8 @@ test:unit: test:datanetwork-integration: stage: test script: + - apt-get update + - apt-get install -y libboost1.65-all-dev - pip install tox-travis - tox -e datanetwork @@ -92,8 +94,9 @@ build:linux: - apt-get install -y --no-install-recommends software-properties-common zip curl build-essential - add-apt-repository -y ppa:deadsnakes/ppa - 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 + - pip install https://s3.amazonaws.com/files.lbry.io/python_libtorrent-1.2.4-py3-none-any.whl # temporarly only on linux build:mac: extends: .build diff --git a/lbry/extras/daemon/daemon.py b/lbry/extras/daemon/daemon.py index 4e81b93e4..9a8c5c92c 100644 --- a/lbry/extras/daemon/daemon.py +++ b/lbry/extras/daemon/daemon.py @@ -3451,7 +3451,8 @@ class Daemon(metaclass=JSONRPCServerType): stream_hash = None 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 old_stream: await self.file_manager.delete(old_stream, delete_file=False)