summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2010-11-30 19:29:22 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2010-11-30 19:29:22 +0100
commitdb4b5f77e1f9f64a54baeff74c0400f0134c1d0d (patch)
treef5b80c7738e41c1e923469da6c2c094c5127bb91 /test
parent4a4ea26c2d0f89c13e0ccf6fb2d96ad1caa6427d (diff)
do not touch Packages and Sources in the framework if the files do
not exist to not generate sources.list entries later for them
Diffstat (limited to 'test')
-rw-r--r--test/integration/framework4
-rwxr-xr-xtest/integration/test-bug-595691-empty-and-broken-archive-files1
2 files changed, 1 insertions, 4 deletions
diff --git a/test/integration/framework b/test/integration/framework
index 7af59deb0..aa8cdacc6 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -116,14 +116,10 @@ setupenvironment() {
local PACKAGESFILE=$(echo "$(basename $0)" | sed -e 's/^test-/Packages-/' -e 's/^skip-/Packages-/')
if [ -f "${TESTDIR}/${PACKAGESFILE}" ]; then
cp "${TESTDIR}/${PACKAGESFILE}" aptarchive/Packages
- else
- touch aptarchive/Packages
fi
local SOURCESSFILE=$(echo "$(basename $0)" | sed -e 's/^test-/Sources-/' -e 's/^skip-/Sources-/')
if [ -f "${TESTDIR}/${SOURCESSFILE}" ]; then
cp "${TESTDIR}/${SOURCESSFILE}" aptarchive/Sources
- else
- touch aptarchive/Sources
fi
cp $(find $TESTDIR -name '*.pub' -o -name '*.sec') keys/
ln -s ${TMPWORKINGDIRECTORY}/keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
diff --git a/test/integration/test-bug-595691-empty-and-broken-archive-files b/test/integration/test-bug-595691-empty-and-broken-archive-files
index 11a5025d2..66792899a 100755
--- a/test/integration/test-bug-595691-empty-and-broken-archive-files
+++ b/test/integration/test-bug-595691-empty-and-broken-archive-files
@@ -7,6 +7,7 @@ setupenvironment
configarchitecture "i386"
buildaptarchive
+touch aptarchive/Packages
setupflataptarchive
testaptgetupdate() {