From 14f13c63097ad8bbe22b2d45ae392c9233df1e8d Mon Sep 17 00:00:00 2001 From: Johannes Schauer Marin Rodrigues Date: Thu, 11 May 2023 06:55:33 +0200 Subject: [PATCH] tests/{eatmydata-via-hook-dir,jessie-or-older}: dash 0.5.12-3 dropped diversions --- tests/eatmydata-via-hook-dir | 6 +++++- tests/jessie-or-older | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/eatmydata-via-hook-dir b/tests/eatmydata-via-hook-dir index 4ffec71..0df72df 100644 --- a/tests/eatmydata-via-hook-dir +++ b/tests/eatmydata-via-hook-dir @@ -34,6 +34,10 @@ elfheader="$elfheader\\001\\000" --hook-dir=./hooks/eatmydata \ --customize-hook='printf "'"$elfheader"'" | cmp --bytes=8 - "$1"/usr/bin/dpkg' \ {{ DIST }} /tmp/debian-chroot {{ MIRROR }} -tar -C /tmp/debian-chroot --one-file-system -c . | tar -t | sort | diff -u tar1.txt - + tar -C /tmp/debian-chroot --one-file-system -c . \ + | tar -t \ + | sort \ + | grep -v '^\./var/lib/dpkg/diversions\(-old\)\?$' \ + | diff -u tar1.txt - rm /tmp/checkeatmydata.sh rm -r /tmp/debian-chroot diff --git a/tests/jessie-or-older b/tests/jessie-or-older index ddfe7a7..a3a2ace 100644 --- a/tests/jessie-or-older +++ b/tests/jessie-or-older @@ -29,6 +29,7 @@ filter() { --path-exclude=/var/cache/debconf/config.dat-old \ --path-exclude=/var/cache/debconf/templates.dat-old \ --path-exclude=/var/lib/dpkg/available \ + --path-exclude=/var/lib/dpkg/diversions \ --path-exclude=/var/lib/dpkg/cmethopt \ --path-exclude=/var/lib/dpkg/status-old \ --path-exclude=/var/lib/shells.state