update manpage last-modified from git via pre-export hook

[apt.git] / test / integration / framework

diff --git a/test/integration/framework b/test/integration/framework
index ee67dd52cb83689ad7a1ece8e30c638a3798e9ea..de8a65d7a74b930b7a4ac34cacd1d45f9fe7610c 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -361,6 +361,7 @@ EOF
                if ! command dpkg --assert-multi-arch >/dev/null 2>&1; then
                        echo "DPKG::options:: \"--force-architecture\";" # Added to test multiarch before dpkg is ready for it…
                fi
+               echo 'quiet "0";'
                echo 'quiet::NoUpdate "true";'
                echo 'quiet::NoStatistic "true";'
                # too distracting for users, but helpful to detect changes
@@ -973,8 +974,8 @@ generatereleasefiles() {
        # both should be given in notation date/touch can understand
        local DATE="$1"
        local VALIDUNTIL="$2"
-       msgninfo "\tGenerate Release files… "
        if [ -e aptarchive/dists ]; then
+               msgninfo "\tGenerate Release files for dists… "
                for dir in $(find ./aptarchive/dists -mindepth 1 -maxdepth 1 -type d); do
                        local ARCHITECTURES="$(getarchitecturesfromreleasefile "$dir")"
                        local SUITE="$(echo "$dir" | cut -d'/' -f 4)"
@@ -982,25 +983,13 @@ generatereleasefiles() {
                        local VERSION="$(getreleaseversionfromsuite $SUITE)"
                        local LABEL="$(getlabelfromsuite $SUITE)"
                        local ORIGIN="$(getoriginfromsuite $SUITE)"
-                       if [ -n "$VERSION" ]; then
-                               VERSION="-o APT::FTPArchive::Release::Version=${VERSION}"
-                       fi
-                       if [ -n "$LABEL" ]; then
-                               LABEL="-o APT::FTPArchive::Release::Label=${LABEL}"
-                       fi
-                       if [ -n "$ORIGIN" ]; then
-                               ORIGIN="-o APT::FTPArchive::Release::Origin=${ORIGIN}"
-                       fi
-                       if [ -n "$ARCHITECTURES" ]; then
-                               ARCHITECTURES="-o APT::FTPArchive::Release::Architectures=${ARCHITECTURES}"
-                       fi
                        aptftparchiverelease "$dir" \
                                -o APT::FTPArchive::Release::Suite="${SUITE}" \
                                -o APT::FTPArchive::Release::Codename="${CODENAME}" \
-                               ${ARCHITECTURES} \
-                               ${LABEL} \
-                               ${ORIGIN} \
-                               ${VERSION} \
+                               -o APT::FTPArchive::Release::Architectures="${ARCHITECTURES}" \
+                               -o APT::FTPArchive::Release::Label="${LABEL}" \
+                               -o APT::FTPArchive::Release::Origin="${ORIGIN}" \
+                               -o APT::FTPArchive::Release::Version="${VERSION}" \
                                > "$dir/Release"
                        if [ "$SUITE" = "experimental" -o "$SUITE" = "experimental2" ]; then
                                sed -i '/^Date: / a\
@@ -1008,6 +997,7 @@ NotAutomatic: yes' "$dir/Release"
                        fi
                done
        else
+               msgninfo "\tGenerate Release files for flat… "
                aptftparchiverelease ./aptarchive > aptarchive/Release
        fi
        if [ -n "$DATE" -a "$DATE" != "now" ]; then
@@ -1411,7 +1401,7 @@ N: No packages found"
        local ARCH="$(getarchitecture 'native')"
        echo "$VIRTUAL" | sed -e "s/:$ARCH//" -e 's/:all//' >"$COMPAREFILE"
        local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/testshowvirtual.output"
-       testoutputequal "$COMPAREFILE" aptcache show -q=0 "$PACKAGE"
+       testoutputequal "$COMPAREFILE" aptcache show "$PACKAGE"
        msggroup
 }
 
@@ -1776,8 +1766,8 @@ listcurrentlistsdirectory() {
 ### convenience hacks ###
 mkdir() {
        # creating some directories by hand is a tedious task, so make it look simple
-       if [ "$*" = '-p rootdir/var/lib/apt/lists' ] || [ "$*" = "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists" ] ||
-          [ "$*" = '-p rootdir/var/lib/apt/lists/partial' ] || [ "$*" = "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists/partial" ]; then
+       local PARAMS="$*"
+       if [ "$PARAMS" != "${PARAMS#*rootdir/var/lib/apt/lists}" ]; then
                # only the last directory created by mkdir is effected by the -m !
                command mkdir -m 755 -p "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt"
                command mkdir -m 755 -p "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists"