From: Alan H. <min...@us...> - 2005-05-13 23:19:21
|
Update of /cvsroot/gallery/gallery2/upgrade/steps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32165/upgrade/steps Modified Files: UpgradeOtherModulesStep.class Log Message: Treat ERROR_CONFIGURATION_REQUIRED in module upgrade as a warning instead of an error with full stack trace and debug output. This keeps beta 2->3 upgrade clean even if rewrite is active and .htaccess isn't writable. Index: UpgradeOtherModulesStep.class =================================================================== RCS file: /cvsroot/gallery/gallery2/upgrade/steps/UpgradeOtherModulesStep.class,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- UpgradeOtherModulesStep.class 12 May 2005 22:54:07 -0000 1.14 +++ UpgradeOtherModulesStep.class 13 May 2005 23:19:09 -0000 1.15 @@ -89,9 +89,15 @@ $moduleIsUpgradeable[$moduleId]) { $ret = $module->installOrUpgrade(); if ($ret->isError()) { - $templateData['errors'][] = - sprintf(_('Unable to upgrade the %s module'), $module->getName()); - $templateData['stackTrace'] .= $ret->getAsHtml(); + if ($ret->getErrorCode() & ERROR_CONFIGURATION_REQUIRED) { + $templateData['needsConfig'][] = + sprintf(_('%s module needs configuration'), $module->getName()); + $moduleIsUpgradeable[$moduleId] = false; + } else { + $templateData['errors'][] = + sprintf(_('Unable to upgrade the %s module'), $module->getName()); + $templateData['stackTrace'] .= $ret->getAsHtml(); + } continue; } $moduleIsUpgradeable[$moduleId] = false; |