*.eclass: Include GNOME2_ECLASS_ICONS condition in postrm as well

The original GNOME2_ECLASS_ICONS patch has moved the condition from gnome2_icon_cache_update to postinst phases of functions using the preinst/postinst logic but accidentally omitted postrm. Include it there as well to restore the old behavior.
hanetzer · Sep 8, 2017 · edb22af · edb22af
1 parent f391dbe
commit edb22af
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
@@ -359,7 +359,9 @@ gnome2_pkg_postinst() {
 # Handle scrollkeeper, GSettings, Icons, desktop and mime database updates.
 gnome2_pkg_postrm() {
  xdg_pkg_postrm
- gnome2_icon_cache_update
+ if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
+ gnome2_icon_cache_update
+ fi
  gnome2_schemas_update
  gnome2_scrollkeeper_update
 

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
@@ -950,7 +950,9 @@ kde4-base_pkg_postinst() {
 kde4-base_pkg_postrm() {
  debug-print-function ${FUNCNAME} "$@"
 
- gnome2_icon_cache_update
+ if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
+ gnome2_icon_cache_update
+ fi
  fdo-mime_desktop_database_update
  fdo-mime_mime_database_update
  buildsycoca

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
@@ -803,7 +803,9 @@ kde5_pkg_postinst() {
 kde5_pkg_postrm() {
  debug-print-function ${FUNCNAME} "$@"
 
- gnome2_icon_cache_update
+ if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
+ gnome2_icon_cache_update
+ fi
  xdg_pkg_postrm
 }
 

diff --git a/eclass/xfconf.eclass b/eclass/xfconf.eclass
@@ -151,5 +151,7 @@ xfconf_pkg_postrm() {
  debug-print-function ${FUNCNAME} "$@"
  fdo-mime_desktop_database_update
  fdo-mime_mime_database_update
- gnome2_icon_cache_update
+ if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then
+ gnome2_icon_cache_update
+ fi
 }