* apt-pkg/deb/debindexfile.cc,

  apt-pkg/deb/deblistparser.cc:
  - use OpenMaybeClearSignedFile to be free from detecting and
    skipping clearsigning metadata in dsc and Release files

We can't write a "clean" file to disk as not all acquire methods copy
Release files before checking them (e.g. cdrom), so this reverts recombining,
but uses the method we use for dsc files also in the two places we
deal with Release files

2 files changed, 3 insertions, 1 deletions

diff --git a/test/integration/framework b/test/integration/framework
index 2ef61ca8..86e6ed7c 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -114,7 +114,7 @@ gdb() {
 }
 
 addtrap() {
-	CURRENTTRAP="$CURRENTTRAP $1"
+	CURRENTTRAP="$1 $CURRENTTRAP"
 	trap "$CURRENTTRAP exit;" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM
 }
 
diff --git a/test/integration/test-apt-cdrom b/test/integration/test-apt-cdrom
index f24c99b3..f1c4fd9d 100755
--- a/test/integration/test-apt-cdrom
+++ b/test/integration/test-apt-cdrom
@@ -24,6 +24,8 @@ cat Translation-de | xz --format=lzma > Translation-de.lzma
 cat Translation-de | xz > Translation-de.xz
 rm Translation-en Translation-de
 cd - > /dev/null
+addtrap "chmod -R +w $PWD/rootdir/media/cdrom/dists/;"
+chmod -R -w rootdir/media/cdrom/dists
 
 aptcdrom add -m -o quiet=1 > apt-cdrom.log 2>&1
 sed -i -e '/^Using CD-ROM/ d' -e '/gpgv/ d' -e '/^Identifying/ d' -e '/Reading / d' apt-cdrom.log