diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2017-07-08 21:52:24 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2017-09-08 09:32:26 +0200 |
| commit | 2a148b8258e24e6119885be466f344f31fe22485 (patch) | |
| tree | 988575f6cca9f988af41aef811383712d34a4c88 /eclass/gnome2.eclass | |
| parent | *.eclass: Include GNOME2_ECLASS_ICONS condition in postrm as well (diff) | |
| download | gentoo-2a148b8258e24e6119885be466f344f31fe22485.tar.gz gentoo-2a148b8258e24e6119885be466f344f31fe22485.tar.bz2 gentoo-2a148b8258e24e6119885be466f344f31fe22485.zip | |
gnome2*.eclass: Move the preinst conditional out of gnome2_schemas_update
Move the GNOME2_ECLASS_GLIB_SCHEMAS conditional from
gnome2_schemas_update straight into the implementation of gnome2.eclass
postinst/postrm.
This variable is set in preinst to indicate whether any files were
installed. However, the updater itself does not use the list in any way
and updates all the schemas anyway.
Therefore, avoid requiring the ebuilds to explicitly define
preinst/postinst when it is known that the package installs schemas,
and instead let gnome2_schemas_update called in postinst/postrm update
schemas unconditionally.
Diffstat (limited to 'eclass/gnome2.eclass')
| -rw-r--r-- | eclass/gnome2.eclass | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass index cb233e747605..d2b45ad560b3 100644 --- a/eclass/gnome2.eclass +++ b/eclass/gnome2.eclass @@ -340,7 +340,9 @@ gnome2_pkg_postinst() { if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then gnome2_icon_cache_update fi - gnome2_schemas_update + if [[ -z ${GNOME2_ECLASS_GLIB_SCHEMAS} ]]; then + gnome2_schemas_update + fi gnome2_scrollkeeper_update gnome2_gdk_pixbuf_update @@ -362,7 +364,9 @@ gnome2_pkg_postrm() { if [[ -n ${GNOME2_ECLASS_ICONS} ]]; then gnome2_icon_cache_update fi - gnome2_schemas_update + if [[ -z ${GNOME2_ECLASS_GLIB_SCHEMAS} ]]; then + gnome2_schemas_update + fi gnome2_scrollkeeper_update if [[ ${#GNOME2_ECLASS_GIO_MODULES[@]} -gt 0 ]]; then |