From 893606ddd20eb362cc9e922f471d742b72b0f789 Mon Sep 17 00:00:00 2001
From: Jason Gross <jgross@mit.edu>
Date: Mon, 29 Jan 2018 22:40:48 -0500
Subject: Work around travis bugs

https://github.com/travis-ci/travis-ci/issues/8507

We use a script and travis_retry to work around "failed to fetch" with
launchpad
---
 .travis.yml                   | 7 ++-----
 etc/ci/sudo-apt-get-update.sh | 4 ++++
 2 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100755 etc/ci/sudo-apt-get-update.sh

diff --git a/.travis.yml b/.travis.yml
index 746f8335e..f70dd2163 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,14 +15,11 @@ addons:
   apt:
     sources:
       - ubuntu-toolchain-r-test
-    packages:
-      - g++-7
-      - libssl-dev
 
 before_install:
   - if [ ! -z "$PPA" ]; then sudo add-apt-repository "$PPA" -y; fi
-  - travis_retry sudo apt-get update -q
-  - travis_retry sudo apt-get install $COQ_PACKAGE -y
+  - travis_retry ./etc/ci/sudo-apt-get-update.sh -q
+  - travis_retry sudo apt-get install g++-7 libssl-dev $COQ_PACKAGE -y
 
 
 before_script:
diff --git a/etc/ci/sudo-apt-get-update.sh b/etc/ci/sudo-apt-get-update.sh
new file mode 100755
index 000000000..f8bf6bed4
--- /dev/null
+++ b/etc/ci/sudo-apt-get-update.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+(sudo apt-get update "$@" 2>&1 || echo 'E: update failed') | tee /tmp/apt.err
+! grep -q '^\(E:\|W: Failed to fetch\)' /tmp/apt.err || exit $?
-- 
cgit v1.2.3