[Rt-commit] rt branch, 4.0/version-words-not-mandatory-in-upgrade, created. rt-4.0.10-33-g053eaf5

[Alex Vandiver]

The branch, 4.0/version-words-not-mandatory-in-upgrade has been created
        at  053eaf569f39eb61e915c8974f7ab523d6b6ea2a (commit)

- Log -----------------------------------------------------------------
commit 053eaf569f39eb61e915c8974f7ab523d6b6ea2a
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Fri Feb 8 20:33:39 2013 -0500

    Fix version parsing in rt-setup-database
    
    ad6a1a8 changed version parsing to use the list of possible "version
    words" in RT::Handle.  Unfortunately, it made their presence mandatory,
    in doing so.

diff --git a/sbin/rt-setup-database.in b/sbin/rt-setup-database.in
index b1e5102..6c52852 100644
--- a/sbin/rt-setup-database.in
+++ b/sbin/rt-setup-database.in
@@ -317,7 +317,7 @@ sub action_upgrade {
         $upgrading_from = scalar <STDIN>;
         chomp $upgrading_from;
         $upgrading_from =~ s/\s+//g;
-    } while $upgrading_from !~ /^\d+\.\d+\.\d+(?:$version_word_regex)\d*$/;
+    } while $upgrading_from !~ /^\d+\.\d+\.\d+(?:$version_word_regex)?\d*$/;
 
     my $upgrading_to = $RT::VERSION;
     return (0, "The current version $upgrading_to is lower than $upgrading_from")

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