From e413a6e70a9633d02f83f7e7f7479278dadb2bbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sat, 17 Mar 2012 13:05:08 +0100
Subject: [PATCH] hopefully get rid of cookiejar error at travis by getting rid
 of diaspora-clients ruby 1.9 dependencies before bundle install. Not sure why
 it's only needed if DB=postgres

---
 script/ci/before_install.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/script/ci/before_install.sh b/script/ci/before_install.sh
index f83061988..859cebf9c 100755
--- a/script/ci/before_install.sh
+++ b/script/ci/before_install.sh
@@ -1,5 +1,12 @@
 #!/bin/bash
 
+# Workaround dependency issues
+if ([ "$DB" == "postgres" -a "$TRAVIS_RUBY_VERSION" == "ree" ]); then
+  echo "Rebuild Gemfile.lock to get rid of diaspora-clients 1.9 dependencies"
+  bundle update diaspora-client
+fi
+
+
 # Ensure known RubyGems version
 if [ "$(gem --version)" != "1.8.17" ]; then
   echo "RubyGems version is $(gem --version). Changing..."