From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1313115-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id C0B54158F58
for <garchives@archives.gentoo.org>; Mon, 16 Aug 2021 20:48:22 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 2BAA1E0B1D;
Mon, 16 Aug 2021 02:12:23 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 0C1F9E0B14
for <gentoo-commits@lists.gentoo.org>; Mon, 16 Aug 2021 02:12:23 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id C2EEA3458BF
for <gentoo-commits@lists.gentoo.org>; Mon, 16 Aug 2021 02:12:21 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 2EC9E858
for <gentoo-commits@lists.gentoo.org>; Mon, 16 Aug 2021 02:12:20 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1629079927.27e725ed6e7991b4267e5002376f497781f8c224.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: metadata/install-qa-check.d/
X-VCS-Repository: repo/gentoo
X-VCS-Files: metadata/install-qa-check.d/60tmpfiles-paths
X-VCS-Directories: metadata/install-qa-check.d/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 27e725ed6e7991b4267e5002376f497781f8c224
X-VCS-Branch: master
Date: Mon, 16 Aug 2021 02:12:20 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 0b2748fa-7160-4b1a-bd7b-47a6c48f3beb
X-Archives-Hash: 933a9a664343508d6d198f96b13429b2
commit: 27e725ed6e7991b4267e5002376f497781f8c224
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 13 01:39:02 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 16 02:12:07 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27e725ed
metadata/install-qa-check.d: only trigger on tmpfiles in forbidden location
It's okay to use "keepdir" on /etc/tmpfiles.d.
See: https://archives.gentoo.org/gentoo-dev/message/50558b55dc34f37b238807fc4759640d
Signed-off-by: Sam James <sam <AT> gentoo.org>
metadata/install-qa-check.d/60tmpfiles-paths | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/metadata/install-qa-check.d/60tmpfiles-paths b/metadata/install-qa-check.d/60tmpfiles-paths
index ed0bdbff8cd..5ef56885ebe 100644
--- a/metadata/install-qa-check.d/60tmpfiles-paths
+++ b/metadata/install-qa-check.d/60tmpfiles-paths
@@ -11,7 +11,12 @@
tmpfiles_check() {
# Check 1
# Scan image for files in /etc/tmpfiles.d which is a forbidden location
- if [[ -d "${ED}"/etc/tmpfiles.d/ ]] ; then
+ # (We use this glob to avoid triggering on keepdir)
+ shopt -s nullglob
+ local files=( "${ED}"/etc/tmpfiles.d/*.conf )
+ shopt -u nullglob
+
+ if [[ ${#files[@]} -gt 0 ]]; then
eqawarn "QA Notice: files installed to /etc/tmpfiles.d"
eqawarn "tmpfiles configuration files must be installed by ebuilds /usr/lib/tmpfiles.d!"
fi