From 6e793c2ba36f43ba3b49e841491b8825e36cb2c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Fri, 10 Mar 2017 11:15:52 +0100 Subject: [PATCH] Don't mark "can't clean" messages from setup.py clean as error Might confuse users to see that marked up like an error when it's perfectly normal for some kinds of installs simply because the specific build folders never were created in the first place. --- .../plugins/softwareupdate/static/js/softwareupdate.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js b/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js index ee31d2d0..019b4240 100644 --- a/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js +++ b/src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js @@ -705,7 +705,10 @@ $(function() { } }; - self._forcedStdoutLine = /You are using pip version .*?, however version .*? is available\.|You should consider upgrading via the '.*?' command\./; + self._forcedStdoutPatterns = ["You are using pip version .*?, however version .*? is available\.", + "You should consider upgrading via the '.*?' command\.", + "'.*?' does not exist -- can't clean it"]; + self._forcedStdoutLine = new RegExp(self._forcedStdoutPatterns.join("|")); self._preprocessLine = function(line) { if (line.stream == "stderr" && line.line.match(self._forcedStdoutLine)) { line.stream = "stdout";