summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-04-10 13:53:28 +0200
committerMichael Vogt <mvo@debian.org>2014-04-10 13:53:28 +0200
commit291a386f1e65c40a1acb01a9a5614ad00efc509d (patch)
tree9a9afd37dbf81a9defa757101f940cbe49722272
parent128aa7d3630f138f37ef83e3e8564feca01ec429 (diff)
fix test-failure in adt
-rw-r--r--test/integration/framework8
1 files changed, 7 insertions, 1 deletions
diff --git a/test/integration/framework b/test/integration/framework
index 8d8a0becc..3b900a960 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -190,7 +190,13 @@ setupenvironment() {
touch var/lib/dpkg/available
mkdir -p usr/lib/apt
ln -s ${METHODSDIR} usr/lib/apt/methods
- ln -s ${BUILDDIRECTORY}/../../debian/apt.conf.autoremove etc/apt/apt.conf.d/01autoremove
+ # use the autoremove from the BUILDDIRECTORY if its there, otherwise
+ # system
+ if [ -e ${BUILDDIRECTORY}/../../debian/apt.conf.autoremove ]; then
+ ln -s ${BUILDDIRECTORY}/../../debian/apt.conf.autoremove etc/apt/apt.conf.d/01autoremove
+ else
+ ln -s /etc/apt/apt.conf.d/01autoremove etc/apt/apt.conf.d/01autoremove
+ fi
cd ..
local PACKAGESFILE=$(echo "$(basename $0)" | sed -e 's/^test-/Packages-/' -e 's/^skip-/Packages-/')
if [ -f "${TESTDIRECTORY}/${PACKAGESFILE}" ]; then