[Rt-commit] rt branch, 4.0/upgrade-syntax-fixes, updated. rt-4.0.0-241-gc00d0be

[? sunnavy]

The branch, 4.0/upgrade-syntax-fixes has been updated
       via  c00d0be634cec9b02560c775b51ef400f2ab843a (commit)
      from  ff1a6d9c9d32b2cd5c502cc5a2df5be2a262ad72 (commit)

Summary of changes:
 etc/upgrade/3.9.8/content |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit c00d0be634cec9b02560c775b51ef400f2ab843a
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Wed May 18 21:29:06 2011 +0800

    Revert "return if no supported rtfm is found"
    
    This reverts commit 90672de5de9f694c083218dbb8b574a671df27c4.
    doh, we used seperated branches to fix upgrade issues.
    see 4.0/upgrade-rtfm-fix for this commit.

diff --git a/etc/upgrade/3.9.8/content b/etc/upgrade/3.9.8/content
index 1c27b5c..6726a8e 100644
--- a/etc/upgrade/3.9.8/content
+++ b/etc/upgrade/3.9.8/content
@@ -9,8 +9,7 @@
     }
 
     unless ( $found_fm_tables->{fm_topics} && $found_fm_tables->{fm_objecttopics} ) {
-        $RT::Logger->error("You appear to be upgrading from RTFM 2.0 - We don't support upgrading this old of an RTFM yet. Ignore this if you don't have RTFM installed at all.");
-        return;
+        $RT::Logger->error("You appear to be upgrading from RTFM 2.0 - We don't support upgrading this old of an RTFM yet");
     }
 
     $RT::Logger->error("We found RTFM tables in your database.  Checking for content.");

-----------------------------------------------------------------------