* apt-pkg/depcache.cc:

[apt.git] / test / integration / framework

diff --git a/test/integration/framework b/test/integration/framework
index aa8cdacc64f87e6a2132e51ea0ee746090f11356..4bbe1b408e15c0b12a8fc7f50b4b6a5abe0972b4 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -134,6 +134,7 @@ setupenvironment() {
        echo "DPKG::options:: \"--force-not-root\";" >> aptconfig.conf
        echo "DPKG::options:: \"--force-bad-path\";" >> aptconfig.conf
        echo "DPKG::options:: \"--log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log\";" >> aptconfig.conf
+       echo 'quiet::NoUpdate "true";' >> aptconfig.conf
        export LC_ALL=C
        msgdone "info"
 }
@@ -337,10 +338,11 @@ insertpackage() {
                echo "Package: $NAME
 Priority: optional
 Section: other
-Installed-Size: 23356
+Installed-Size: 42
 Maintainer: Joe Sixpack <joe@example.org>
 Architecture: $ARCH
-Version: $VERSION" >> $FILE
+Version: $VERSION
+Filename: pool/main/${NAME}/${NAME}_${VERSION}_${ARCH}.deb" >> $FILE
                test -z "$DEPENDENCIES" || echo "$DEPENDENCIES" >> $FILE
                echo "Description: an autogenerated dummy ${NAME}=${VERSION}/${RELEASE}
  If you find such a package installed on your system,
@@ -380,8 +382,8 @@ generatereleasefiles() {
        if [ -e aptarchive/dists ]; then
                for dir in $(find ./aptarchive/dists -mindepth 1 -maxdepth 1 -type d); do
                        local CODENAME="$(echo "$dir" | cut -d'/' -f 4)"
-                       aptftparchive -qq release $dir -o APT::FTPArchive::Release::Codename="${CODENAME}" | sed -e '/0 Release$/ d' > $dir/Release # remove the self reference
-                       if [ "$CODENAME" = "experimental" ]; then
+                       aptftparchive -qq release $dir -o APT::FTPArchive::Release::Suite="${CODENAME}" -o APT::FTPArchive::Release::Codename="${CODENAME}" | sed -e '/0 Release$/ d' > $dir/Release # remove the self reference
+                       if [ "$CODENAME" = "experimental" -o "$CODENAME" = "experimental2" ]; then
                                sed -i '/^Date: / a\
 NotAutomatic: yes' $dir/Release
                        fi