gtk-icon-cache: rename intercept to update_gtk_icon_cache

Message ID 20190624162711.3879-1-ross.burton@intel.com
State Accepted
Commit 3158adbe684890adc56af11e19af872e90e09d41
Headers show
Series
  • gtk-icon-cache: rename intercept to update_gtk_icon_cache
Related show

Commit Message

Ross Burton June 24, 2019, 4:27 p.m.
The intercept is called update_icon_cache which is vague: rename to
update_gtk_icon_cache to make it clearer what it is for, and add a comment
explaining what class caused it to be used.

Signed-off-by: Ross Burton <ross.burton@intel.com>

---
 meta/classes/gtk-icon-cache.bbclass                                   | 4 ++--
 .../postinst-intercepts/{update_icon_cache => update_gtk_icon_cache}  | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)
 rename scripts/postinst-intercepts/{update_icon_cache => update_gtk_icon_cache} (76%)

-- 
2.11.0

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass
index 66fe781bd2c..91cb4ad4090 100644
--- a/meta/classes/gtk-icon-cache.bbclass
+++ b/meta/classes/gtk-icon-cache.bbclass
@@ -6,7 +6,7 @@  PACKAGE_WRITE_DEPS += "gtk+3-native gdk-pixbuf-native"
 
 gtk_icon_cache_postinst() {
 if [ "x$D" != "x" ]; then
-	$INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} \
+	$INTERCEPT_DIR/postinst_intercept update_gtk_icon_cache ${PKG} \
 		mlprefix=${MLPREFIX} \
 		libdir_native=${libdir_native}
 else
@@ -24,7 +24,7 @@  fi
 
 gtk_icon_cache_postrm() {
 if [ "x$D" != "x" ]; then
-	$INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} \
+	$INTERCEPT_DIR/postinst_intercept update_gtk_icon_cache ${PKG} \
 		mlprefix=${MLPREFIX} \
 		libdir=${libdir}
 else
diff --git a/scripts/postinst-intercepts/update_icon_cache b/scripts/postinst-intercepts/update_gtk_icon_cache
similarity index 76%
rename from scripts/postinst-intercepts/update_icon_cache
rename to scripts/postinst-intercepts/update_gtk_icon_cache
index 212209a9daf..99367a2855a 100644
--- a/scripts/postinst-intercepts/update_icon_cache
+++ b/scripts/postinst-intercepts/update_gtk_icon_cache
@@ -2,10 +2,11 @@ 
 #
 # SPDX-License-Identifier: MIT
 #
+# Post-install intercept for gtk-icon-cache.bbclass
 
 set -e
 
-# update native pixbuf loaders
+# Update native pixbuf loaders
 $STAGING_DIR_NATIVE/${libdir_native}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache
 
 for icondir in $D/usr/share/icons/*/ ; do