| 1 |
commit: 8758194e529edd6103cf740935cb67d5bd514773 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 29 07:59:14 2017 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 29 16:37:06 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=8758194e |
| 7 |
|
| 8 |
gnome2-utils postinst: Restrict file types to fix false positives |
| 9 |
|
| 10 |
Restrict the file types checked by the gtk-icon-cache-update check |
| 11 |
to match the one used inside the tool. This ensures that we do not |
| 12 |
report any false positives for files that are intentionally skipped. |
| 13 |
|
| 14 |
Bug: https://bugs.gentoo.org/629148 |
| 15 |
Closes: https://github.com/gentoo/portage/pull/196 |
| 16 |
Reviewed-by: Gilles Dartiguelongue <eva <AT> gentoo.org> |
| 17 |
Reviewed-by: Brian Dolbec <dolsen <AT> gentoo.org> |
| 18 |
|
| 19 |
bin/postinst-qa-check.d/50gnome2-utils | 7 ++++++- |
| 20 |
1 file changed, 6 insertions(+), 1 deletion(-) |
| 21 |
|
| 22 |
diff --git a/bin/postinst-qa-check.d/50gnome2-utils b/bin/postinst-qa-check.d/50gnome2-utils |
| 23 |
index d0cbb4037..84025ab83 100644 |
| 24 |
--- a/bin/postinst-qa-check.d/50gnome2-utils |
| 25 |
+++ b/bin/postinst-qa-check.d/50gnome2-utils |
| 26 |
@@ -6,7 +6,12 @@ gnome2_icon_cache_check() { |
| 27 |
# gnome2_icon_cache_update updates only themes with an index |
| 28 |
[[ -f ${d}/index.theme ]] || continue |
| 29 |
|
| 30 |
- find_args=() |
| 31 |
+ find_args=( |
| 32 |
+ # gtk-update-icon-cache supports only specific file |
| 33 |
+ # suffixes; match that to avoid false positives |
| 34 |
+ '(' -name '*.png' -o -name '*.svg' |
| 35 |
+ -o -name '*.xpm' -o -name '*.icon' ')' |
| 36 |
+ ) |
| 37 |
# if the cache does not exist at all, we complain for any file |
| 38 |
# otherwise, we look for files newer than the cache |
| 39 |
[[ -f ${d}/icon-theme.cache ]] && |
Archives