Browse Source

experimental is an incomplete archive, so try to get the packages which
could not be installed from experimental from unstable instead

David Kalnischkies 15 years ago
parent
commit
b99d5aeff2
1 changed files with 5 additions and 1 deletions
  1. 5 1
      test/integration/create-test-data

+ 5 - 1
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' \