Merge branch 'saas' into saas-media-refactor

Conflicts: airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-26 14:26:33 -05:00 · 2015-02-26 14:26:33 -05:00 · f1a311dad6
commit f1a311dad6
parent ab6d83f49d 6047670dbd
4 changed files with 62 additions and 59 deletions
--- a/python_apps/pypo/pypofile.py
+++ b/python_apps/pypo/pypofile.py
@ -167,7 +167,7 @@ class PypoFile(Thread):
        except IOError as e:
            logging.debug("Failed to open config file at %s: %s" % (config_path, e.strerror))
            sys.exit()
-        except Exception:
+        except Exception as e:
            logging.debug(e.strerror) 
            sys.exit()