No error 500 if kindlegen is not excecutable

2017-05-25 09:30:20 +02:00
parent 0a08a07193
commit e6c6c26fd1
2 changed files with 19 additions and 10 deletions
@@ -1261,13 +1261,16 @@ def stats():
        kindlegen = os.path.join(vendorpath, u"kindlegen")
    versions['KindlegenVersion'] = _('not installed')
    if os.path.exists(kindlegen):
-        p = subprocess.Popen(kindlegen, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        p.wait()
-        for lines in p.stdout.readlines():
-            if isinstance(lines, bytes):
-                lines = lines.decode('utf-8')
-            if re.search('Amazon kindlegen\(', lines):
-                versions['KindlegenVersion'] = lines
+        try:
+            p = subprocess.Popen(kindlegen, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            p.wait()
+            for lines in p.stdout.readlines():
+                if isinstance(lines, bytes):
+                    lines = lines.decode('utf-8')
+                if re.search('Amazon kindlegen\(', lines):
+                    versions['KindlegenVersion'] = lines
+        except:
+            versions['KindlegenVersion'] = _('Excecution permissions missing')
    versions['PythonVersion'] = sys.version
    versions['babel'] = babelVersion
    versions['sqlalchemy'] = sqlalchemyVersion