do not touch Packages and Sources in the framework if the files do

not exist to not generate sources.list entries later for them

diff --git a/test/integration/framework b/test/integration/framework
index 7af59deb01ad17599859faaaef1b3df0def0ddee..aa8cdacc64f87e6a2132e51ea0ee746090f11356 100644 (file)
--- 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 11a5025d2c94c28013ce3c8095ebd9d4fc5ce763..66792899a834e4c1b3ee5aa5ade5efbfd985dd4f 100755 (executable)
--- 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() {