|
11 | 11 | from pkg_resources import DistributionNotFound, VersionConflict |
12 | 12 | from qgis.core import QgsApplication, QgsSettings |
13 | 13 | from qgis.PyQt.QtWidgets import QAction |
| 14 | +from pyplugin_installer import installer |
14 | 15 |
|
15 | 16 | from .ui import MainDialog |
16 | 17 | from .utils import Lib, Req, icon, log, run_cmd |
@@ -54,10 +55,11 @@ def __init__(self, iface, plugin_path=None): |
54 | 55 |
|
55 | 56 | sys.path_importer_cache.clear() |
56 | 57 |
|
57 | | - # Monkey patch qgis.utils |
58 | | - log("Applying monkey patch to qgis.utils") |
| 58 | + # Monkey patch qgis.utils and installer |
| 59 | + log("Applying monkey patch to qgis.utils and installer") |
59 | 60 | self._original_loadPlugin = qgis.utils.loadPlugin |
60 | 61 | qgis.utils.loadPlugin = self.patched_load_plugin |
| 62 | + installer.loadPlugin = self.patched_load_plugin |
61 | 63 |
|
62 | 64 | self.iface.initializationCompleted.connect(self.initComplete) |
63 | 65 |
|
@@ -87,8 +89,9 @@ def unload(self): |
87 | 89 | self.iface.removePluginMenu("QPIP", self.show_folder_action) |
88 | 90 |
|
89 | 91 | # Remove monkey patch |
90 | | - log("Unapplying monkey patch to qgis.utils") |
| 92 | + log("Unapplying monkey patch to qgis.utils and installer") |
91 | 93 | qgis.utils.loadPlugin = self._original_loadPlugin |
| 94 | + installer.loadPlugin = self._original_loadPlugin |
92 | 95 |
|
93 | 96 | # Remove path alterations |
94 | 97 | if self.site_packages_path in sys.path: |
|
0 commit comments