diff options
| author | James Le Cuirot <chewi@gentoo.org> | 2016-01-01 13:37:10 +0000 |
|---|---|---|
| committer | James Le Cuirot <chewi@gentoo.org> | 2016-01-01 22:49:14 +0000 |
| commit | 3aed1ee10a16450bb54c10607b904ad3fe7a8571 (patch) | |
| tree | 1978ea705c3a5bb1da312394890e9e17a2f81740 /eclass/java-vm-2.eclass | |
| parent | a9b0d1b1b609a89da6c7cf92a19b3c7e8e203899 (diff) | |
| download | gentoo-3aed1ee10a16450bb54c10607b904ad3fe7a8571.tar.gz gentoo-3aed1ee10a16450bb54c10607b904ad3fe7a8571.tar.xz | |
java-vm-2.eclass: Only call nsplugin functions if necessary
…when install_mozilla_plugin has been called. All these functions will
be removed soon so this is a transitional measure.
Diffstat (limited to 'eclass/java-vm-2.eclass')
| -rw-r--r-- | eclass/java-vm-2.eclass | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/eclass/java-vm-2.eclass b/eclass/java-vm-2.eclass index eb94451c7c3..7a5ba834e51 100644 --- a/eclass/java-vm-2.eclass +++ b/eclass/java-vm-2.eclass @@ -84,8 +84,11 @@ java-vm-2_pkg_postinst() { fi fi - java-vm_check-nsplugin - java_mozilla_clean_ + if [[ "${_install_mozilla_plugin_called}" = 1 ]]; then + java-vm_check-nsplugin + java_mozilla_clean_ + fi + fdo-mime_desktop_database_update } @@ -360,6 +363,8 @@ java_get_plugin_dir_() { # Register a netscape java-plugin. install_mozilla_plugin() { + _install_mozilla_plugin_called=1 + local plugin="${1}" local variant="${2}" |