diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-05-07 15:41:54 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-05-07 15:41:54 +0200 |
| commit | ff94be47f5dbdcf99cea23fad8c9b992a8e5a67e (patch) | |
| tree | dd57b80bf6ecd853fb3c6d5eab041630ecd1e75e /test/integration/framework | |
| parent | e39698a485e332742b935292dc4329abf19cbb53 (diff) | |
| parent | 98c934f2723d63d00908803ad47ab1359081ec2d (diff) | |
Merge branch 'debian/sid' into bugfix/update-progress-reporting
Diffstat (limited to 'test/integration/framework')
| -rw-r--r-- | test/integration/framework | 8 |
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 |