From 7b41275b9da31d6c87bbaa0c9115e224e47b15e1 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Wed, 13 Dec 2023 17:55:11 +0100 Subject: Do not silently ignore directories for reserved file names Files with reserved extensions like .list, .sources, .conf, and .pref should receive notices in their respective directories even if they are directories. --- test/integration/test-ignored-files | 43 +++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100755 test/integration/test-ignored-files (limited to 'test') diff --git a/test/integration/test-ignored-files b/test/integration/test-ignored-files new file mode 100755 index 000000000..90defdcd4 --- /dev/null +++ b/test/integration/test-ignored-files @@ -0,0 +1,43 @@ +#!/bin/sh +set -e + +TESTDIR="$(readlink -f "$(dirname "$0")")" +. "$TESTDIR/framework" + +setupenvironment +configarchitecture 'amd64' + +setupaptarchive --no-update + +testsuccessequal "Reading package lists... +Building dependency tree... +All packages are up to date." apt update -q + + +msgtest "Check notices about .list and .sources directories in sources.list.d" +mkdir rootdir/etc/apt/sources.list.d/a-dir-that-will-be-ignored +mkdir rootdir/etc/apt/sources.list.d/a-dir-that-will-be-ignored.conf +mkdir rootdir/etc/apt/sources.list.d/a-dir-that-will-not-be-ignored.list +mkdir rootdir/etc/apt/sources.list.d/a-dir-that-will-not-be-ignored.sources +testsuccessequal "Reading package lists... +Building dependency tree... +All packages are up to date. +N: Ignoring 'a-dir-that-will-not-be-ignored.list' in directory '${TMPWORKINGDIRECTORY}/rootdir/etc/apt/sources.list.d/' as it is not a regular file +N: Ignoring 'a-dir-that-will-not-be-ignored.sources' in directory '${TMPWORKINGDIRECTORY}/rootdir/etc/apt/sources.list.d/' as it is not a regular file" apt update +rmdir rootdir/etc/apt/sources.list.d/a-dir-* + +msgtest "Check for notices about .conf directories in apt.conf.d" +mkdir -p rootdir/etc/apt/apt.conf.d/a-dir-that-will-be-ignored +mkdir -p rootdir/etc/apt/apt.conf.d/a-dir-that-will-be-ignored.list +mkdir -p rootdir/etc/apt/apt.conf.d/a-dir-that-will-not-be-ignored.conf +testsuccessequal "N: Ignoring 'a-dir-that-will-not-be-ignored.conf' in directory '${TMPWORKINGDIRECTORY}/rootdir/etc/apt/apt.conf.d/' as it is not a regular file" aptconfig shell +rmdir rootdir/etc/apt/apt.conf.d/a-dir-* + +msgtest "Check for directory notices in preferences.d" +mkdir -p rootdir/etc/apt/preferences.d/a-dir-that-will-be-ignored +mkdir -p rootdir/etc/apt/preferences.d/a-dir-that-will-be-ignored.conf +mkdir -p rootdir/etc/apt/preferences.d/a-dir-that-will-not-be-ignored.pref +testsuccessequal "Package files: +Pinned packages: +N: Ignoring 'a-dir-that-will-not-be-ignored.pref' in directory '${TMPWORKINGDIRECTORY}/rootdir/etc/apt/preferences.d/' as it is not a regular file" apt policy +rmdir rootdir/etc/apt/preferences.d/a-dir-* -- cgit v1.2.3-70-g09d2