From 16bff2ff84b8116928ae7fd90364b29abaac0fb4 Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <julian.klode@canonical.com>
Date: Fri, 6 Apr 2018 15:07:52 +0200
Subject: Delete /etc/dpkg/dpkg.cfg.d/excludes on Docker CI images

Fixes test suite on Ubuntu docker images.
---
 Dockerfile    | 1 +
 shippable.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 76b134003..35db15863 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,5 +7,6 @@ RUN sed -i s#://deb.debian.org#://cdn-fastly.deb.debian.org# /etc/apt/sources.li
     && env DEBIAN_FRONTEND=noninteractive apt-get install build-essential ccache ninja-build expect curl git -q -y \
     && env DEBIAN_FRONTEND=noninteractive ./prepare-release travis-ci \
     && dpkg-reconfigure ccache \
+    && rm -f /etc/dpkg/dpkg.cfg.d/excludes \
     && rm -r /tmp/* \
     && apt-get clean
diff --git a/shippable.yml b/shippable.yml
index 0091b95ea..5aafda9cf 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -11,5 +11,6 @@ build:
     - mkdir build
     - ( cd build && cmake -DWITH_CURL=OFF .. )
     - make -C build -j 4
+    - rm -f /etc/dpkg/dpkg.cfg.d/excludes
     - CTEST_OUTPUT_ON_FAILURE=1 make -C build test
     - unbuffer ./test/integration/run-tests -q -j 4
-- 
cgit v1.2.3