test-apt-cdrom: Fix for gnupg 2.1.15

[apt.git] / test / integration / create-test-data

diff --git a/test/integration/create-test-data b/test/integration/create-test-data
index b93218b7cb7c9bbb01ceed235fdb50c6c99f9c79..7040aaed7c532c36dcfbbe4913e6755c83b3073e 100755 (executable)
--- a/test/integration/create-test-data
+++ b/test/integration/create-test-data
@@ -6,8 +6,8 @@ if [ -z "$1" -o -z "$2" ]; then
        exit 1
 fi
 
-local TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"
 BUILDDIRECTORY="${TESTDIR}/../../build/bin"
 
 GENERATE=$1
@@ -26,7 +26,7 @@ if [ -z "$LISTOFPKGS" ]; then
        aptget install $* -t $CODENAME -so Dir::state::status=$WORKDIR/status -o Dir::Cache::archives=$WORKDIR -o pkgCacheGen::Essential=none -o APT::Immediate-Configure=0
        exit 1
 fi
-aptcache show $LISTOFPKGS --no-all-versions 2> /dev/null > $TMPGEN
+aptcache show $LISTOFPKGS --no-all-versions 2> $WORKDIR/error.lst > $TMPGEN
 sed -i $TMPGEN \
        -e '/^ / d' \
        -e '/^SHA1: / d' -e '/^SHA256: / d' \
@@ -34,6 +34,10 @@ sed -i $TMPGEN \
        -e '/^Xul-Appid: / d' \
        -e '/^Status: / d'
 
+if [ "$CODENAME" = "experimental" ]; then
+       aptcache show $(cat $WORKDIR/error.lst | cut -d"'" -f 4 | sed -e 's#$#/sid#') --no-all-versions 2> /dev/null >> $TMPGEN
+fi
+
 if echo "$GENERATE" | grep '^status-' > /dev/null; then
        sed -i $TMPGEN -e '/^Package: / a\
 Status: install ok installed' \