summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-04-10 14:24:16 +0200
committerMichael Vogt <mvo@debian.org>2014-04-10 14:24:16 +0200
commit9346a0fd0ab1b5c87c56c84447f06570be3b63cf (patch)
treed978d38afdcd6d24a1a493281023176b7dee5a8f /test
parentb3f695d42baa95139e8172e97b0f4ab38550b7b5 (diff)
parent291a386f1e65c40a1acb01a9a5614ad00efc509d (diff)
Merge branch 'debian/sid' into ubuntu/master
Diffstat (limited to 'test')
-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