From 5e54f3a52384948a8b44c8467b85381ad7c9fc8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Mon, 27 Apr 2015 18:43:00 +0200 Subject: [PATCH] Persist package name for plugins loaded from entry point This allows later deinstallation even if module and package name differ. --- src/octoprint/plugin/core.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/octoprint/plugin/core.py b/src/octoprint/plugin/core.py index 99ec798f..26d4ca41 100644 --- a/src/octoprint/plugin/core.py +++ b/src/octoprint/plugin/core.py @@ -542,10 +542,11 @@ class PluginManager(object): url=module_pkginfo.home_page, license=module_pkginfo.license )) + package_name = module_pkginfo.name plugin = self._import_plugin_from_module(key, **kwargs) if plugin: - plugin.origin = ("entry_point", group, module_name) + plugin.origin = ("entry_point", group, module_name, package_name) plugin.enabled = False result[key] = plugin