aboutsummaryrefslogtreecommitdiffstats
path: root/debian-repo-install-test
diff options
context:
space:
mode:
authorOliver Smith <osmith@sysmocom.de>2019-02-20 10:39:03 +0100
committerHarald Welte <laforge@gnumonks.org>2019-02-20 18:13:15 +0000
commit0b3587fae8448f21425fac1a6c098f9102d3dbde (patch)
tree4840ab71259a5a1fdb98cfb6ba2752f0dbe0b8b1 /debian-repo-install-test
parent2e9ef62349bedba0d543c6efb674bfa7b5cdd26e (diff)
debian-repo-test: blacklist soapysdr0.7
Fix conflict in debian-repo-test-latest by not explicitly installing soapysdr0.7: dpkg: error processing archive /tmp/apt-dpkg-install-aYn9qf/398-soapysdr0.7-module-lms7_19.01.0-1_amd64.deb (--unpack): trying to overwrite '/usr/lib/x86_64-linux-gnu/SoapySDR/modules0.5-2/libLMS7Support.so', which is also in package soapysdr0.5-2-module-lms7:amd64 16.12.0+dfsg-1 I have tested locally, that debian-repo-test passes with this patch with both FEED=latest and FEED=nightly. Related: OS#3809 Change-Id: Ic7c6b95d20345b39af2ba0d09dddd361696723be
Diffstat (limited to 'debian-repo-install-test')
-rw-r--r--debian-repo-install-test/testdata/blacklist.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/debian-repo-install-test/testdata/blacklist.txt b/debian-repo-install-test/testdata/blacklist.txt
index 4d3f7ed..cb7db6a 100644
--- a/debian-repo-install-test/testdata/blacklist.txt
+++ b/debian-repo-install-test/testdata/blacklist.txt
@@ -23,3 +23,5 @@ osmocom-nitb-dbg
soapysdr-module-lms7
soapysdr0.6-module-lms7
soapysdr0.6-module-lms7-dbgsym
+soapysdr0.7-module-lms7
+soapysdr0.7-module-lms7-dbgsym