From 88f8077b7748d22f9ef9a8c389eff12608e64051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Mon, 17 Oct 2016 12:16:53 +0200 Subject: [PATCH 1/2] Plugin JS files might be empty, need to handle that Otherwise webassets will explode with empty file list on bundle creation. --- src/octoprint/server/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/octoprint/server/__init__.py b/src/octoprint/server/__init__.py index b1e4692d..873122e5 100644 --- a/src/octoprint/server/__init__.py +++ b/src/octoprint/server/__init__.py @@ -1058,6 +1058,8 @@ class Server(object): "js/app/helpers.js", "js/app/main.js"] js_plugins = dynamic_plugin_assets["external"]["js"] + if len(js_plugins) == 0: + js_plugins = ["empty"] js_app = js_plugins + js_core css_libs = [ From 2f79d9d226507e1fb7a1cd76452c08c4b0896f72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Mon, 17 Oct 2016 12:25:51 +0200 Subject: [PATCH 2/2] Preparing release of 1.2.17rc4 --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 38ae44a6..c07cb5b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # OctoPrint Changelog +## 1.2.17rc4 (2016-10-17) + +### Bug fixes + + * Properly handle empty JS file list from plugins. Solves a 500 on OctoPrint instances without any third party plugins installed generated during web asset bundling introduced in 1.2.17rc2. + +([Commits](https://github.com/foosel/OctoPrint/compare/1.2.17rc3...1.2.17rc4)) + ## 1.2.17rc3 (2016-10-13) ### Bug fixes