From: Roger Meier <roger@apache.org>
Date: Sat, 4 Jan 2014 23:18:32 +0000 (+0100)
Subject: .travis.yml: do "The Miracle Combination" for apt-get§
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=2c7e89b30593b2288ee47ff56c614099bf238b29;p=common%2Fthrift.git

.travis.yml: do "The Miracle Combination" for apt-get§
---

diff --git a/.travis.yml b/.travis.yml
index 68af5314..c2d1b6f6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,7 @@ language: cpp
 before_install:
  - export NUM_CPU="`grep processor /proc/cpuinfo | wc -l`"; echo $NUM_CPU
  - sudo apt-get update -qq
- - sudo apt-get upgrade -qq
+ - sudo DEBIAN_FRONTEND=noninteractive apt-get -qq -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" upgrade
  - sudo apt-get install -qq libboost-dev libboost-test-dev libboost-program-options-dev libevent-dev automake libtool flex bison pkg-config g++ libssl-dev 
 # Java
  - sudo apt-get install -qq libcommons-lang3-java ant