From e01f86c37757a5934e706b6352c408e30a37bc02 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Wed, 17 Oct 2012 16:45:03 -0400 Subject: [PATCH] CC-4588: Airtime 2.2 upgrade does not upgrade "list_all_db_files" correctly -fixed --- .../upgrades/airtime-2.2.0/common/UpgradeCommon.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/install_minimal/upgrades/airtime-2.2.0/common/UpgradeCommon.php b/install_minimal/upgrades/airtime-2.2.0/common/UpgradeCommon.php index 1d7183bcc..77c297a65 100644 --- a/install_minimal/upgrades/airtime-2.2.0/common/UpgradeCommon.php +++ b/install_minimal/upgrades/airtime-2.2.0/common/UpgradeCommon.php @@ -105,6 +105,12 @@ class UpgradeCommon{ self::CreateIniFiles(UpgradeCommon::CONF_BACKUP_SUFFIX); self::MergeConfigFiles($configFiles, $suffix); + + //HACK: This will fix a last minute bug we discovered with our upgrade scripts. + //Will be fixed properly in 2.3.0 + $old = "list_all_db_files = 'list-all-files/format/json/api_key/%%api_key%%/dir_id/%%dir_id%%'"; + $new = "list_all_db_files = 'list-all-files/format/json/api_key/%%api_key%%/dir_id/%%dir_id%%/all/%%all%%'"; + exec("sed -i \"s#$old#$new#g\" /etc/airtime/api_client.cfg"); } /** @@ -162,11 +168,13 @@ class UpgradeCommon{ foreach($sectionKeys as $sectionKey) { if(isset($oldSettings[$section][$sectionKey])) { - self::UpdateIniValue($conf, $sectionKey, $oldSettings[$section][$sectionKey]); + self::UpdateIniValue($conf, $sectionKey, + $oldSettings[$section][$sectionKey]); } } } else { - self::UpdateIniValue($conf, $section, $oldSettings[$section]); + self::UpdateIniValue($conf, $section, + $oldSettings[$section]); } } }