From 70355cc364abec2a0dad90c049b9ab9ed09bfda7 Mon Sep 17 00:00:00 2001 From: Naomi Date: Tue, 17 May 2011 10:28:56 -0400 Subject: [PATCH] CC-2256 Airtime-upgrade.php does not upgrade the web app trying to fix daemontools upgrade problems --- install/airtime-upgrade.php | 6 +++--- python_apps/api_clients/api_client.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/install/airtime-upgrade.php b/install/airtime-upgrade.php index ce29752ce..9ef857019 100644 --- a/install/airtime-upgrade.php +++ b/install/airtime-upgrade.php @@ -46,12 +46,12 @@ if(strcmp($version, "1.8.2") < 0) { AirtimeInstall::SetAirtimeVersion(AIRTIME_VERSION); -echo PHP_EOL."*** Updating Pypo ***".PHP_EOL; -system("python ".__DIR__."/../python_apps/pypo/install/pypo-install.py"); - echo PHP_EOL."*** Updating Recorder ***".PHP_EOL; system("python ".__DIR__."/../python_apps/show-recorder/install/recorder-install.py"); +echo PHP_EOL."*** Updating Pypo ***".PHP_EOL; +system("python ".__DIR__."/../python_apps/pypo/install/pypo-install.py"); + echo "******************************* Update Complete *******************************".PHP_EOL; diff --git a/python_apps/api_clients/api_client.py b/python_apps/api_clients/api_client.py index fcdbf59f2..a01229042 100644 --- a/python_apps/api_clients/api_client.py +++ b/python_apps/api_clients/api_client.py @@ -198,14 +198,14 @@ class AirTimeApiClient(ApiClientInterface): return False elif (version[0:3] != AIRTIME_VERSION): if (verbose): - print 'Airtime version: ' + str(version) - print 'pypo not compatible with this version of Airtime.' + print 'Airtime version found: ' + str(version) + print 'pypo is at version ' +AIRTIME_VERSION+' and is not compatible with this version of Airtime.' print return False else: if (verbose): print 'Airtime version: ' + str(version) - print 'pypo is compatible with this version of Airtime.' + print 'pypo is at version ' +AIRTIME_VERSION+' and is compatible with this version of Airtime.' print return True