summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2010-12-05 12:46:56 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2010-12-05 12:46:56 +0100
commitb99d5aeff24b0b8477e5699ce391bfd63478d742 (patch)
tree79b48325272a3d71e1e7b72875e49bcd4d71829c
parent067cc3695f46704b890211788a85ad05e7004c6d (diff)
experimental is an incomplete archive, so try to get the packages which
could not be installed from experimental from unstable instead
-rwxr-xr-xtest/integration/create-test-data6
1 files changed, 5 insertions, 1 deletions
diff --git a/test/integration/create-test-data b/test/integration/create-test-data
index b93218b7c..581b62910 100755
--- a/test/integration/create-test-data
+++ b/test/integration/create-test-data
@@ -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' \