From 8696ce9291197b9716f2eb9c909fdb63e528c6fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Tue, 9 Jun 2015 13:54:21 +0200 Subject: [PATCH] Fix: Bundled plugins always take precedence over external ones --- CHANGELOG.md | 16 ++++++---------- src/octoprint/plugin/core.py | 3 ++- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0822454c..b8b1ac6b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,9 @@ * Custom controls now support a row layout * Users can now define custom GCODE scripts to run upon starting/pausing/resuming/success/failure of a print or for custom controls ([#457](https://github.com/foosel/OctoPrint/issues/457), [#347](https://github.com/foosel/OctoPrint/issues/347)) +* Bundled [Software Update Plugin](https://github.com/foosel/OctoPrint/wiki/Plugin:-Software-Update) takes care of notifying about new OctoPrint releases and also allows + updating if configured as such. Plugins may register themselves with the update notification and application process + through a new hook ["octoprint.plugin.softwareupdate.check_config"](). ### Improvements @@ -188,6 +191,9 @@ * [#892](https://github.com/foosel/OctoPrint/issues/892) - Preselected baudrate is now properly used for auto detected serial ports * [#909](https://github.com/foosel/OctoPrint/issues/909) - Fixed Z-Timelapse for Z changes on ``G1`` moves. + * Fixed another instance of a missing `branch` field in version dicts generated by versioneer (compare + [#634](https://github.com/foosel/OctoPrint/pull/634)). Caused an issue when installing from source archive + downloaded from Github. * Various fixes without tickets: * GCODE viewer now doesn't stumble over completely extrusionless GCODE files * Do not deliver the API key on settings API unless user has admin rights @@ -207,16 +213,6 @@ ([Commits](https://github.com/foosel/OctoPrint/compare/master...devel)) -## 1.1.3 (unreleased) - -### Bug Fixes - -* Fixed another instance of a missing `branch` fields in version dicts generated by versioneer (compare - [#634](https://github.com/foosel/OctoPrint/pull/634)). Caused an issue when installing from source archive - downloaded from Github. - -([Commits](https://github.com/foosel/OctoPrint/compare/1.1.2...master)) - ## 1.1.2 (2015-03-23) ### Improvements diff --git a/src/octoprint/plugin/core.py b/src/octoprint/plugin/core.py index c973a870..e20062d1 100644 --- a/src/octoprint/plugin/core.py +++ b/src/octoprint/plugin/core.py @@ -467,12 +467,13 @@ class PluginManager(object): def find_plugins(self, existing=None, ignore_uninstalled=True): if existing is None: - existing = self.plugins + existing = dict(self.plugins) result = dict() if self.plugin_folders: result.update(self._find_plugins_from_folders(self.plugin_folders, existing, ignored_uninstalled=ignore_uninstalled)) if self.plugin_entry_points: + existing.update(result) result.update(self._find_plugins_from_entry_points(self.plugin_entry_points, existing, ignore_uninstalled=ignore_uninstalled)) return result