Merge branch 'master' into develop

mopidy_iris/__init__.py

@@ -12,7 +12,7 @@ from handlers import WebsocketHandler, HttpHandler
 from core import IrisCore
 
 logger = logging.getLogger(__name__)
-__version__ = '3.32.4'
+__version__ = '3.32.5'
 
 ##
 # Core extension class

mopidy_iris/static/index.html

@@ -98,8 +98,8 @@
 
 	// Release details
 	// These are automatically injected to built HTML
-	var build = "1550561376";
-	var version = "3.32.4";
+	var build = "1550561713";
+	var version = "3.32.5";
 
 	// Construct the script tag
     var js = document.createElement("script");

mopidy_iris/system.py

@@ -57,6 +57,6 @@ class IrisSystemThread(Thread):
 
         # Some kind of failure, so we can't run any commands this way
         if exitCode > 0:
-            raise Exception("Password-less access to "+path+"/system.sh was refused. Check your /etc/sudoers file.")
+            raise Exception("Password-less access to "+self.path+"/system.sh was refused. Check your /etc/sudoers file.")
         else:
             return True

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mopidy-iris",
-  "version": "3.32.4",
+  "version": "3.32.5",
   "description": "Mopidy HTTP interface",
   "repository": "https://github.com/jaedb/iris",
   "author": "James Barnsley <james@barnsley.nz>",