From c9b99af9c43986b86c7350688e66f6daf3d7035d Mon Sep 17 00:00:00 2001 From: james Date: Fri, 26 Aug 2011 10:35:02 -0400 Subject: [PATCH 1/5] CC-2722: Overwrite errors on upgrade from 1.8.2 to 1.9.2-RC1 - fixed - wasn't able to reproduce the first error msg --- install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php | 1 + 1 file changed, 1 insertion(+) diff --git a/install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php index 795440896..8243ea31b 100644 --- a/install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php +++ b/install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php @@ -66,6 +66,7 @@ class AirtimeInstall{ exec("rm -f /usr/bin/airtime-import"); exec("rm -f /usr/bin/airtime-update-db-settings"); exec("rm -f /usr/bin/airtime-check-system"); + exec("rm -f /usr/bin/airtime-user"); } public static function DbTableExists($p_name) From 3a8bf217be3cd4d24e606780cc89c23af24cb695 Mon Sep 17 00:00:00 2001 From: james Date: Fri, 26 Aug 2011 10:36:56 -0400 Subject: [PATCH 2/5] CC-2735: upgrade - suffix was 192 which causes upgrade script terminate --- install_minimal/upgrades/airtime-1.9.3/airtime-upgrade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install_minimal/upgrades/airtime-1.9.3/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.9.3/airtime-upgrade.php index 3bc8cb21b..210a4b63f 100644 --- a/install_minimal/upgrades/airtime-1.9.3/airtime-upgrade.php +++ b/install_minimal/upgrades/airtime-1.9.3/airtime-upgrade.php @@ -129,7 +129,7 @@ } } - $default_suffix = "192"; + $default_suffix = "193"; AirtimeIni193::CreateIniFiles($default_suffix); AirtimeIni193::MergeConfigFiles($configFiles, $suffix); } From b8f67d5027d405513c86bedd68f3e126dec98fa2 Mon Sep 17 00:00:00 2001 From: james Date: Fri, 26 Aug 2011 11:46:35 -0400 Subject: [PATCH 3/5] - Change log change --- Changelog | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Changelog b/Changelog index a683c697a..a0adf814f 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,14 @@ +1.9.3 - August 26th, 2011 + *Improvements + -It is now possible to upgrade your system while a show is playing. + Playout will be temporarily interrupted for about 5-10 seconds and then + playout will resume. Previously playout would not resume until the next + scheduled show. + *fixes + -Fixed bug where playout system did not work with mono files. + -Fixed bug where sometimes audio files could be played out of order. + + 1.9.2 - August 23rd, 2011 *Fixes -Fixed restarting sometimes caused media-monitor to forget all of its watched directories From 665957c5d76d5415831721fb4aaaa049034a817d Mon Sep 17 00:00:00 2001 From: james Date: Fri, 26 Aug 2011 19:45:43 -0400 Subject: [PATCH 4/5] - change on CREDITS file --- CREDITS | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CREDITS b/CREDITS index b6108f552..7bcb234b6 100644 --- a/CREDITS +++ b/CREDITS @@ -1,6 +1,17 @@ ======= CREDITS ======= +Version 1.9.3 +------------- +Same as previous version. + +Version 1.9.2 +------------- +Same as previous version. + +Version 1.9.1 +------------- +Same as previous version. Version 1.9.0 ------------- From 8b0b5851f60a465d232c4a57f60ce6ce5dc264fc Mon Sep 17 00:00:00 2001 From: martin Date: Mon, 29 Aug 2011 14:43:30 -0400 Subject: [PATCH 5/5] -fix typo in recorder.py --- python_apps/show-recorder/recorder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python_apps/show-recorder/recorder.py b/python_apps/show-recorder/recorder.py index bb05d02ba..22bf64452 100644 --- a/python_apps/show-recorder/recorder.py +++ b/python_apps/show-recorder/recorder.py @@ -155,7 +155,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")