[Catalyst-commits] r13364 - in Catalyst-Plugin-Session/0.00/trunk: . lib/Catalyst/Plugin

[bricas at dev.catalyst.perl.org]

Author: bricas
Date: 2010-06-24 13:43:10 +0100 (Thu, 24 Jun 2010)
New Revision: 13364

Modified:
   Catalyst-Plugin-Session/0.00/trunk/Changes
   Catalyst-Plugin-Session/0.00/trunk/Makefile.PL
   Catalyst-Plugin-Session/0.00/trunk/lib/Catalyst/Plugin/Session.pm
Log:
Fix Makefile.PL's is_upgrading_needed() routine (RT #58771)

Modified: Catalyst-Plugin-Session/0.00/trunk/Changes
===================================================================
--- Catalyst-Plugin-Session/0.00/trunk/Changes	2010-06-22 20:47:45 UTC (rev 13363)
+++ Catalyst-Plugin-Session/0.00/trunk/Changes	2010-06-24 12:43:10 UTC (rev 13364)
@@ -1,5 +1,8 @@
 Revision history for Perl extension Catalyst::Plugin::Session
 
+0.30 TO BE RELEASED
+        - Fix Makefile.PL's is_upgrading_needed() routine (RT #58771)
+
 0.29 2009-11-04
         - Fix session being deleted when you have a new session after session
           expiry when calling session_is_valid method. Tests for this.

Modified: Catalyst-Plugin-Session/0.00/trunk/Makefile.PL
===================================================================
--- Catalyst-Plugin-Session/0.00/trunk/Makefile.PL	2010-06-22 20:47:45 UTC (rev 13363)
+++ Catalyst-Plugin-Session/0.00/trunk/Makefile.PL	2010-06-24 12:43:10 UTC (rev 13364)
@@ -42,13 +42,15 @@
     );
 
     foreach my $module (keys %state) {
-        if ( eval "require Catalyst::Plugin::Session::State::$module" and
-        ${"Catalyst::Plugin::Session::State::${module}::VERSION"} < $state{$module} ) {
+        my $package = 'Catalyst::Plugin::Session::State::' . $module;
+
+        next if not eval "require $package;";
+
+        if( not eval { $package->VERSION( $state{ $module } ); } ) {
             warn <<WARN;
-
 ********** NOTE **********
 
-Catalyst::Plugin::Session::State::$module must also be updated!
+$package must also be updated!
 
 The currently installed version is *not* compatible with this version of
 Catalyst::Plugin::Session!

Modified: Catalyst-Plugin-Session/0.00/trunk/lib/Catalyst/Plugin/Session.pm
===================================================================
--- Catalyst-Plugin-Session/0.00/trunk/lib/Catalyst/Plugin/Session.pm	2010-06-22 20:47:45 UTC (rev 13363)
+++ Catalyst-Plugin-Session/0.00/trunk/lib/Catalyst/Plugin/Session.pm	2010-06-24 12:43:10 UTC (rev 13364)
@@ -13,7 +13,7 @@
 
 use namespace::clean -except => 'meta';
 
-our $VERSION = '0.29';
+our $VERSION = '0.30';
 $VERSION = eval $VERSION;
 
 my @session_data_accessors; # used in delete_session