Merge branch '1.9.1' into devel

2011-08-31 10:15:00 -04:00 · 2011-08-31 10:15:00 -04:00 · c460519a88
commit c460519a88
parent 06c0947328 982c8f9c20
5 changed files with 16 additions and 10 deletions
--- a/python_apps/show-recorder/recorder.py
+++ b/python_apps/show-recorder/recorder.py
@ -157,7 +157,7 @@ class ShowRecorder(Thread):

                self.upload_file(filepath)
                os.remove(filepath)
-            except Exceptio, e:
+            except Exception, e:
                self.logger.error(e)
        else:
            self.logger.info("problem recording show")