From: Ondřej Surý <ondrej@sury.org>
Date: Wed, 5 Apr 2017 10:26:19 +0000 (+0200)
Subject: Fix duplicate python installation
X-Git-Tag: v1.2.6~12^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a006d92993d8c31a18be0886c19bed552cf4795;p=thirdparty%2Fknot-resolver.git

Fix duplicate python installation
---

diff --git a/scripts/bootstrap-depends.sh b/scripts/bootstrap-depends.sh
index 0aa291e33..50fd2497f 100755
--- a/scripts/bootstrap-depends.sh
+++ b/scripts/bootstrap-depends.sh
@@ -127,8 +127,14 @@ function pkg {
 PIP_PKGS="dnspython==1.11 cpp-coveralls Jinja2"
 if [ "${TRAVIS_OS_NAME}" == "osx" ]; then
 	brew update
-	brew install --force makedepend python hiredis libmemcached protobuf@2.6 protobuf-c cmocka jansson gnutls luajit libuv
+	brew unlink python
+	brew install python
 	brew link --overwrite python || true
+	for p in python makedepend hiredis libmemcached protobuf-c cmocka jansson gnutls luajit libuv; do
+		echo "BEGIN $p";
+		brew install $p
+		echo "END $p";
+	done
 	pip install --upgrade pip || true
 	pip install ${PIP_PKGS}
 fi