From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 097BA1396D0 for ; Tue, 29 Aug 2017 16:38:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3DDD7E0CA4; Tue, 29 Aug 2017 16:38:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 1C9BDE0CA4 for ; Tue, 29 Aug 2017 16:38:32 +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 D3A9B33FE74 for ; Tue, 29 Aug 2017 16:38:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 871B686E9 for ; Tue, 29 Aug 2017 16:38:28 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1504024626.8758194e529edd6103cf740935cb67d5bd514773.mgorny@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/postinst-qa-check.d/ X-VCS-Repository: proj/portage X-VCS-Files: bin/postinst-qa-check.d/50gnome2-utils X-VCS-Directories: bin/postinst-qa-check.d/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 8758194e529edd6103cf740935cb67d5bd514773 X-VCS-Branch: master Date: Tue, 29 Aug 2017 16:38:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7fa7f154-e21f-4b0c-bb2a-f971fdd70a6e X-Archives-Hash: 7503ce9ad5f8752409ae206904a65bd6 commit: 8758194e529edd6103cf740935cb67d5bd514773 Author: Michał Górny gentoo org> AuthorDate: Tue Aug 29 07:59:14 2017 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Aug 29 16:37:06 2017 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=8758194e gnome2-utils postinst: Restrict file types to fix false positives Restrict the file types checked by the gtk-icon-cache-update check to match the one used inside the tool. This ensures that we do not report any false positives for files that are intentionally skipped. Bug: https://bugs.gentoo.org/629148 Closes: https://github.com/gentoo/portage/pull/196 Reviewed-by: Gilles Dartiguelongue gentoo.org> Reviewed-by: Brian Dolbec gentoo.org> bin/postinst-qa-check.d/50gnome2-utils | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bin/postinst-qa-check.d/50gnome2-utils b/bin/postinst-qa-check.d/50gnome2-utils index d0cbb4037..84025ab83 100644 --- a/bin/postinst-qa-check.d/50gnome2-utils +++ b/bin/postinst-qa-check.d/50gnome2-utils @@ -6,7 +6,12 @@ gnome2_icon_cache_check() { # gnome2_icon_cache_update updates only themes with an index [[ -f ${d}/index.theme ]] || continue - find_args=() + find_args=( + # gtk-update-icon-cache supports only specific file + # suffixes; match that to avoid false positives + '(' -name '*.png' -o -name '*.svg' + -o -name '*.xpm' -o -name '*.icon' ')' + ) # if the cache does not exist at all, we complain for any file # otherwise, we look for files newer than the cache [[ -f ${d}/icon-theme.cache ]] &&