Explorar el Código

do not load filesize in pkgAcqIndexTrans explicitly

The constructor is calling the baseclass pkgAcqIndex which does this
already – and also does it correctly for compressed files which would
overwise lead to the size of uncompressed files to be expected.

Git-Dch: Ignore
David Kalnischkies hace 11 años
padre
commit
78bc8d6b16

+ 0 - 4
apt-pkg/acquire-item.cc

@@ -1486,10 +1486,6 @@ pkgAcqIndexTrans::pkgAcqIndexTrans(pkgAcquire *Owner,
                                    indexRecords *MetaIndexParser)
    : pkgAcqIndex(Owner, TransactionManager, Target, ExpectedHashes, MetaIndexParser)
 {
-   // load the filesize
-   indexRecords::checkSum *Record = MetaIndexParser->Lookup(string(Target->MetaKey));
-   if(Record)
-      FileSize = Record->Size;
 }
 									/*}}}*/
 // AcqIndexTrans::Custom600Headers - Insert custom request headers	/*{{{*/

+ 1 - 1
test/integration/test-bug-596498-trusted-unsigned-repo

@@ -12,7 +12,7 @@ setupaptarchive
 
 aptgetupdate() {
 	rm -rf rootdir/var/lib/apt/ rootdir/var/cache/apt/*.bin
-	aptget update -qq --allow-insecure-repositories
+	testsuccess aptget update --allow-insecure-repositories
 }
 
 PKGTEXT="$(aptget install cool --assume-no -d | head -n 7)"

+ 4 - 3
test/integration/test-compressed-indexes

@@ -51,6 +51,7 @@ testrun() {
 		! test -e rootdir/var/lib/apt/lists/*_Translation-en.* || F=1
 	fi
 	if [ -n "$F" ]; then
+		cat rootdir/tmp/testsuccess.output
 		ls -laR rootdir/var/lib/apt/lists/
 		msgfail
 	else
@@ -103,15 +104,15 @@ testovermethod() {
 			INDCOMP='compressed'
 		fi
 
-		testsuccess aptget update
+		testsuccess aptget update -o Debug::Acquire::http=1
 		msgmsg "${1}: ${COMPRESSOR}: Test with $INDCOMP indexes"
 		testrun "$INDCOMP"
 
-		testsuccess aptget update -o Acquire::Pdiffs=1
+		testsuccess aptget update -o Acquire::Pdiffs=1 -o Debug::Acquire::http=1
 		msgmsg "${1}: ${COMPRESSOR}: Test with $INDCOMP indexes (update unchanged with pdiffs)"
 		testrun "$INDCOMP"
 
-		testsuccess aptget update -o Acquire::Pdiffs=0
+		testsuccess aptget update -o Acquire::Pdiffs=0 -o Debug::Acquire::http=1
 		msgmsg "${1}: ${COMPRESSOR}: Test with $INDCOMP indexes (update unchanged without pdiffs)"
 		testrun "$INDCOMP"