From 333618efc855e0de4fa95eee127cd5db523ef8d6 Mon Sep 17 00:00:00 2001 From: Roy Johnson Date: Wed, 21 Jun 2006 20:22:53 +0000 Subject: [PATCH] fix - 6.99.2-6.99.3 upgrade fails if spectre.conf doesn't exist --- docs/changelog/6.x.x.txt | 1 + docs/upgrades/upgrade_6.99.2-6.99.3.pl | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index a5c330d3f..a1f63650e 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -9,6 +9,7 @@ roughly every 30 hours under certain conditions. - fix: Problems with page.isSibling and page.inBranch - Added new EMS event approval states + - Fix: 6.99.2-6.99.3 upgrade fails if spectre.conf doesn't exist 6.99.4 - fix: better checking of selected template type diff --git a/docs/upgrades/upgrade_6.99.2-6.99.3.pl b/docs/upgrades/upgrade_6.99.2-6.99.3.pl index 4b03e3d8f..4de727e63 100644 --- a/docs/upgrades/upgrade_6.99.2-6.99.3.pl +++ b/docs/upgrades/upgrade_6.99.2-6.99.3.pl @@ -37,6 +37,10 @@ sub addAssetIndex { #------------------------------------------------- sub fixSpectre { print "\tAdding more security to Spectre.\n" unless ($quiet); + unless (-e "../../etc/spectre.conf") { + print "\t *** Skiping this portion of the upgrade. You do not have a spectre.conf file. Read gotcha.txt for details. ***\n" unless ($quiet); + return; + } my $config = WebGUI::Config->new("../..","spectre.conf"); $config->set("ip","127.0.0.1"); }