commit:     8758194e529edd6103cf740935cb67d5bd514773
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 29 07:59:14 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> 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 <eva <AT> gentoo.org>
Reviewed-by: Brian Dolbec <dolsen <AT> 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 ]] &&

Reply via email to