| 1 |
commit: 3aed1ee10a16450bb54c10607b904ad3fe7a8571 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 1 13:37:10 2016 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 1 22:49:14 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3aed1ee1 |
| 7 |
|
| 8 |
java-vm-2.eclass: Only call nsplugin functions if necessary |
| 9 |
|
| 10 |
…when install_mozilla_plugin has been called. All these functions will |
| 11 |
be removed soon so this is a transitional measure. |
| 12 |
|
| 13 |
eclass/java-vm-2.eclass | 9 +++++++-- |
| 14 |
1 file changed, 7 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/eclass/java-vm-2.eclass b/eclass/java-vm-2.eclass |
| 17 |
index eb94451..7a5ba83 100644 |
| 18 |
--- a/eclass/java-vm-2.eclass |
| 19 |
+++ b/eclass/java-vm-2.eclass |
| 20 |
@@ -84,8 +84,11 @@ java-vm-2_pkg_postinst() { |
| 21 |
fi |
| 22 |
fi |
| 23 |
|
| 24 |
- java-vm_check-nsplugin |
| 25 |
- java_mozilla_clean_ |
| 26 |
+ if [[ "${_install_mozilla_plugin_called}" = 1 ]]; then |
| 27 |
+ java-vm_check-nsplugin |
| 28 |
+ java_mozilla_clean_ |
| 29 |
+ fi |
| 30 |
+ |
| 31 |
fdo-mime_desktop_database_update |
| 32 |
} |
| 33 |
|
| 34 |
@@ -360,6 +363,8 @@ java_get_plugin_dir_() { |
| 35 |
# Register a netscape java-plugin. |
| 36 |
|
| 37 |
install_mozilla_plugin() { |
| 38 |
+ _install_mozilla_plugin_called=1 |
| 39 |
+ |
| 40 |
local plugin="${1}" |
| 41 |
local variant="${2}" |
Archives