Просмотр исходного кода

do not touch Packages and Sources in the framework if the files do
not exist to not generate sources.list entries later for them

David Kalnischkies лет назад: 15
Родитель
Сommit
db4b5f77e1

+ 0 - 4
test/integration/framework

@@ -116,14 +116,10 @@ setupenvironment() {
 	local PACKAGESFILE=$(echo "$(basename $0)" | sed -e 's/^test-/Packages-/' -e 's/^skip-/Packages-/')
 	local PACKAGESFILE=$(echo "$(basename $0)" | sed -e 's/^test-/Packages-/' -e 's/^skip-/Packages-/')
 	if [ -f "${TESTDIR}/${PACKAGESFILE}" ]; then
 	if [ -f "${TESTDIR}/${PACKAGESFILE}" ]; then
 		cp "${TESTDIR}/${PACKAGESFILE}" aptarchive/Packages
 		cp "${TESTDIR}/${PACKAGESFILE}" aptarchive/Packages
-	else
-		touch aptarchive/Packages
 	fi
 	fi
 	local SOURCESSFILE=$(echo "$(basename $0)" | sed -e 's/^test-/Sources-/' -e 's/^skip-/Sources-/')
 	local SOURCESSFILE=$(echo "$(basename $0)" | sed -e 's/^test-/Sources-/' -e 's/^skip-/Sources-/')
 	if [ -f "${TESTDIR}/${SOURCESSFILE}" ]; then
 	if [ -f "${TESTDIR}/${SOURCESSFILE}" ]; then
 		cp "${TESTDIR}/${SOURCESSFILE}" aptarchive/Sources
 		cp "${TESTDIR}/${SOURCESSFILE}" aptarchive/Sources
-	else
-		touch aptarchive/Sources
 	fi
 	fi
 	cp $(find $TESTDIR -name '*.pub' -o -name '*.sec') keys/
 	cp $(find $TESTDIR -name '*.pub' -o -name '*.sec') keys/
 	ln -s ${TMPWORKINGDIRECTORY}/keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
 	ln -s ${TMPWORKINGDIRECTORY}/keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg

+ 1 - 0
test/integration/test-bug-595691-empty-and-broken-archive-files

@@ -7,6 +7,7 @@ setupenvironment
 configarchitecture "i386"
 configarchitecture "i386"
 
 
 buildaptarchive
 buildaptarchive
+touch aptarchive/Packages
 setupflataptarchive
 setupflataptarchive
 
 
 testaptgetupdate() {
 testaptgetupdate() {