From 7c59acba5699c9c58090a7a738669669a7307023 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 21 Aug 2021 23:14:26 +0100 Subject: gentoo resync : 21.08.2021 --- metadata/install-qa-check.d/60tmpfiles-paths | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'metadata/install-qa-check.d/60tmpfiles-paths') diff --git a/metadata/install-qa-check.d/60tmpfiles-paths b/metadata/install-qa-check.d/60tmpfiles-paths index aa666dfb7ce5..1d46cab6ecc0 100644 --- a/metadata/install-qa-check.d/60tmpfiles-paths +++ b/metadata/install-qa-check.d/60tmpfiles-paths @@ -28,12 +28,12 @@ tmpfiles_check() { # We're now going to check for whether we install files to /usr/lib/tmpfiles.d without # inheriting the eclass (weak catch for ebuilds not calling tmpfiles_process in pkg_postinst) - # It's okay for some packages to do this because of circular dependencies and such - # See: https://archives.gentoo.org/gentoo-dev/message/0a96793036a4fdd9ac311a46950d7e7b - # TODO: Standardize some way of allowing ebuilds to opt-out of checks like this - local package=${CATEGORY}/${PN} - - if [[ ${package} == "sys-apps/systemd" || ${package} == "sys-libs/pam" ]] ; then + if [[ -n ${TMPFILES_OPTIONAL} ]] ; then + # While imperfect, using ${TMPFILES_OPTIONAL} is good enough to allow opting out + # for e.g. sys-apps/portage, sys-apps/systemd, sys-libs/pam, etc. We may want + # a better/more standardised way to opt out from QA checks in future. + # It's okay for some packages to do this because of circular dependencies and such + # See: https://archives.gentoo.org/gentoo-dev/message/0a96793036a4fdd9ac311a46950d7e7b return fi -- cgit v1.2.3