* apt-pkg/deb/dpkgpm.cc:

[apt.git] / test / integration / framework

diff --git a/test/integration/framework b/test/integration/framework
index 8efe473307b0b0a70dcd9af2201c6df065040421..2b26fc8f7e84600fac679a44f95d98ca2986ca06 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -72,6 +72,9 @@ aptconfig() { runapt apt-config $*; }
 aptcache() { runapt apt-cache $*; }
 aptget() { runapt apt-get $*; }
 aptftparchive() { runapt apt-ftparchive $*; }
+dpkg() {
+       $(which dpkg) --root=${TMPWORKINGDIRECTORY}/rootdir --force-not-root --force-bad-path --log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log $*
+}
 
 setupenvironment() {
        TMPWORKINGDIRECTORY=$(mktemp -d)
@@ -85,8 +88,8 @@ setupenvironment() {
        cd $TMPWORKINGDIRECTORY
        mkdir rootdir aptarchive keys
        cd rootdir
-       mkdir -p etc/apt/apt.conf.d etc/apt/sources.list.d etc/apt/trusted.gpg.d etc/apt/preferences.d var/cache
-       mkdir -p var/log/apt var/lib/apt
+       mkdir -p etc/apt/apt.conf.d etc/apt/sources.list.d etc/apt/trusted.gpg.d etc/apt/preferences.d
+       mkdir -p var/cache var/lib var/log
        mkdir -p var/lib/dpkg/info var/lib/dpkg/updates var/lib/dpkg/triggers
        local STATUSFILE=$(echo "$(basename $0)" | sed 's/^test-/status-/')
        if [ -f "${TESTDIR}/${STATUSFILE}" ]; then
@@ -228,6 +231,10 @@ buildaptarchive() {
 
 createaptftparchiveconfig() {
        local ARCHS="$(find pool/ -name '*.deb' | grep -oE '_[a-z0-9-]+\.deb$' | sort | uniq | sed -e '/^_all.deb$/ d' -e 's#^_\([a-z0-9-]*\)\.deb$#\1#' | tr '\n' ' ')"
+       if [ -z "$ARCHS" ]; then
+               # the pool is empty, so we will operate on faked packages - let us use the configured archs
+               ARCHS="$(aptconfig dump | grep APT::Architecture | cut -d'"' -f 2 | sed '/^$/ d' | sort | uniq | tr '\n' ' ')"
+       fi
        echo -n 'Dir {
        ArchiveDir "' >> ftparchive.conf
        echo -n $(readlink -f .) >> ftparchive.conf