[QGIS Commit] r13845 - trunk/qgis/python/plugins/plugin_installer

[svn_qgis at osgeo.org]

Author: borysiasty
Date: 2010-06-29 20:21:18 +0000 (Tue, 29 Jun 2010)
New Revision: 13845

Modified:
   trunk/qgis/python/plugins/plugin_installer/installer_gui.py
Log:
Plugin Installer minor fix

Modified: trunk/qgis/python/plugins/plugin_installer/installer_gui.py
===================================================================
--- trunk/qgis/python/plugins/plugin_installer/installer_gui.py	2010-06-29 20:04:49 UTC (rev 13844)
+++ trunk/qgis/python/plugins/plugin_installer/installer_gui.py	2010-06-29 20:21:18 UTC (rev 13845)
@@ -689,12 +689,15 @@
     else:
       # if the uninstalled plugin is the installer itself, reload it and quit
       if key == "plugin_installer":
-        try:
-          QMessageBox.information(self, self.tr("QGIS Python Plugin Installer"), self.tr("Plugin Installer update uninstalled. Plugin Installer will now close and revert to its primary version. You can find it in the Plugins menu and continue operation."))
-          reloadPlugin(key)
-          return
-        except:
-          pass
+        if QGIS_15:
+          try:
+            QMessageBox.information(self, self.tr("QGIS Python Plugin Installer"), self.tr("Plugin Installer update uninstalled. Plugin Installer will now close and revert to its primary version. You can find it in the Plugins menu and continue operation."))
+            reloadPlugin(key)
+            return
+          except:
+            pass
+        else:
+          QMessageBox.information(self, self.tr("QGIS Python Plugin Installer"), self.tr("Plugin Installer update uninstalled. Please restart QGIS in order to load its primary version."))
       # safe remove
       try:
         unloadPlugin(plugin["localdir"])