commit 9963b3beda4ad29b050c60bbae2efdba6b3d79fc Author: anadahz kojgelo@inbox.com Date: Sun Dec 20 15:30:05 2015 +0100

No need to downgrade Twisted

All Twister version are supported by ooniprobe! Fixed (https://trac.torproject.org/projects/tor/ticket/15944) --- scripts/install.sh | 4 ---- 1 file changed, 4 deletions(-)

diff --git a/scripts/install.sh b/scripts/install.sh index beb9f60..01318ce 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -324,10 +324,6 @@ case "$lsb_dist" in set -x $sh_c 'apt-get install -y -q curl git-core python python-dev python-setuptools build-essential libdumbnet1 python-dumbnet python-libpcap tor tor-geoipdb libgeoip-dev libpcap0.8-dev libssl-dev libffi-dev libdumbnet-dev' $sh_c "PYTHONPATH=$PYTHONPATH pip install --install-option="--prefix=$PYTHON_PREFIX" ooniprobe" - # Unistall Twisted and install a version >=12.2.0,<=14.0.0 - # https://trac.torproject.org/projects/tor/ticket/15944 - $sh_c "PYTHONPATH=$PYTHONPATH pip uninstall -y Twisted" - $sh_c "PYTHONPATH=$PYTHONPATH pip install --install-option="--prefix=$PYTHON_PREFIX" 'Twisted>=12.2.0,<=14.0.0'" ) fi