pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: Bundled plugins always take precedence over external ones

Browse source
This commit is contained in:
Gina Häußge 2015-06-09 13:54:21 +02:00
parent 2e6240a910
commit 8696ce9291
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
CHANGELOG.md
View file

@ -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

3
src/octoprint/plugin/core.py
View file

@ -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