eval $VERSION to avoid non-numeric warnings.

[catagits/Catalyst-Runtime.git] / lib / Catalyst.pm

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 847b678..4ce44ed 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -77,6 +77,7 @@ __PACKAGE__->stats_class('Catalyst::Stats');
 # Remember to update this in Catalyst::Runtime as well!
 
 our $VERSION = '5.8000_06';
+$VERSION = eval $VERSION;
 
 sub import {
     my ( $class, @arguments ) = @_;
@@ -90,7 +91,7 @@ sub import {
 
     # Kill Adopt::NEXT warnings if we're a non-RC version
     if ($VERSION !~ /_\d{2}$/) {
-        Class::C3::Adopt::NEXT->unimport(qr/^Catalyst/);
+        Class::C3::Adopt::NEXT->unimport(qr/^Catalyst::/);
     }
 
     my $meta = Moose::Meta::Class->initialize($caller);
@@ -2051,7 +2052,7 @@ sub setup_components {
     my $deprecated_component_names = grep { /::[CMV]::/ } @comps;
     $class->log->warn(qq{Your application is using the deprecated ::[MVC]:: type naming scheme.\n}.
         qq{Please switch your class names to ::Model::, ::View:: and ::Controller: as appropriate.\n}
-    );
+    ) if $deprecated_component_names;
 
     for my $component ( @comps ) {