fix #1038

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8340 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Apr 12, 2008 · db98723 · db98723
1 parent af39121
commit db98723
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/src/app/qgspythonutils.cpp b/src/app/qgspythonutils.cpp
@@ -340,17 +340,32 @@ QString QgsPythonUtils::getPluginMetadata(QString pluginName, QString function)
 bool QgsPythonUtils::loadPlugin(QString packageName)
 {
   // load plugin's package and ensure that plugin is reloaded when changed
+  runString(
+       "try:\n"
+       "  import " + packageName + "\n"
+       "  reload(" + packageName + ")\n"
+       "  __main__.__plugin_result = 'OK'\n"
+       "except:\n"
+       "  __main__.__plugin_result = 'ERROR'\n");
+
+  if( getVariableFromMain("__plugin_result") == "OK" )
+    return true;
+
+  // snake in the grass, we know it's there
+  runString("sys.path_importer_cache.clear()");
+
+  // retry
   runString(
        "try:\n"
        "  import " + packageName + "\n"
        "  reload(" + packageName + ")\n"
        "  __main__.__plugin_result = 'OK'\n"
        "except:\n"
        "  qgis_except_hook_msg(sys.exc_type, sys.exc_value, sys.exc_traceback, "
-       "                       'Couldn\\'t load plugin \"" + packageName + "\"')\n"
+            "'Couldn\\'t load plugin \"" + packageName + "\" from [\\'' + '\\', \\''.join(sys.path) + '\\']')\n"
        "  __main__.__plugin_result = 'ERROR'\n");
-  
-  return (getVariableFromMain("__plugin_result") == "OK");
+
+  return getVariableFromMain("__plugin_result") == "OK";
 }