SF.net SVN: ledger-smb:[5045] trunk/LedgerSMB

[..hidden..]

Revision: 5045
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5045&view=rev
Author:   einhverfr
Date:     2012-07-25 14:44:19 +0000 (Wed, 25 Jul 2012)
Log Message:
-----------
Version detection logic for 1.4 complete.

Modified Paths:
--------------
    trunk/LedgerSMB/Database.pm
    trunk/LedgerSMB/Scripts/setup.pm

Modified: trunk/LedgerSMB/Database.pm
===================================================================
--- trunk/LedgerSMB/Database.pm	2012-07-25 14:38:36 UTC (rev 5044)
+++ trunk/LedgerSMB/Database.pm	2012-07-25 14:44:19 UTC (rev 5045)
@@ -35,7 +35,8 @@
 my $dbversions = {
     '1.2' => '1.2.0',
     '1.3dev' => '1.2.99',
-    '1.3' => '1.3.0'
+    '1.3' => '1.3.0',
+    '1.4' => '1.4'
 };
 
 my $temp = $LedgerSMB::Sysconfig::tempdir;
@@ -331,6 +332,8 @@
                 $retval->{version} = '1.2';
            } elsif ($ref->{value} eq '1.2.99'){
                 $retval->{version} = '1.3dev';
+           } elsif ($ref->{value} =~ /^1.3.99/ or $ref->{value} =~ /^1.4/){
+                $retval->{version} = "1.4";
            } elsif ($ref->{value} =~ /^1.3/){
                 $retval->{version} = '1.3';
            }

Modified: trunk/LedgerSMB/Scripts/setup.pm
===================================================================
--- trunk/LedgerSMB/Scripts/setup.pm	2012-07-25 14:38:36 UTC (rev 5044)
+++ trunk/LedgerSMB/Scripts/setup.pm	2012-07-25 14:44:19 UTC (rev 5045)
@@ -104,14 +104,22 @@
             $request->{operation} = $request->{_locale}->text('Cancel?');
             $request->{next_action} = 'cancel';
          
+         } elsif ($version_info->{version} eq '1.4') {
+             $request->{message} = $request->{_locale}->text(
+                 'LedgerSMB 1.4 found'   
+             );
+             $request->{operation} = $request->{_locale}->text(
+                    'Rebuild/Upgrade?'
+             );
+             $request->{next_action} = 'rebuild_modules';
          } elsif ($version_info->{version} eq '1.3') {
              $request->{message} = $request->{_locale}->text(
                  'LedgerSMB 1.3 found'   
              );
              $request->{operation} = $request->{_locale}->text(
-                    'Rebuild/Upgrade?'
+                    'Upgrade?'
              );
-             $request->{next_action} = 'rebuild_modules';
+             $request->{next_action} = 'upgrade';
          } else {
             $request->{message} = $request->{_locale}->text(
                  'Unknown version found.'

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.