X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse%2FExporter.pm;h=e3cb85a848be0546f216482683baf1bb67294bec;hp=71936e5351b2fee99834077298814e49aa9c181a;hb=3d7c6ec96a92be50258d124bdec61fb91bca3830;hpb=267711f78bd79835875f805447d3ab802a18f0c4

diff --git a/lib/Mouse/Exporter.pm b/lib/Mouse/Exporter.pm
index 71936e5..e3cb85a 100644
--- a/lib/Mouse/Exporter.pm
+++ b/lib/Mouse/Exporter.pm
@@ -171,7 +171,7 @@ sub do_import {
     if($spec->{INIT_META}){
         my $meta;
         foreach my $init_meta(@{$spec->{INIT_META}}){
-            $meta = $into->$init_meta(for_class => $into);
+            $meta = $package->$init_meta(for_class => $into);
         }
 
         if(@traits){
@@ -183,9 +183,11 @@ sub do_import {
                 } @traits;
 
             require Mouse::Util::MetaRole;
-            Mouse::Util::MetaRole::apply_metaclass_roles(
-                for_class       => $into,
-                metaclass_roles => \@traits,
+            Mouse::Util::MetaRole::apply_metaroles(
+                for       => $into,
+                Mouse::Util::is_a_metarole($into->meta)
+                    ? (role_metaroles  => { role  => \@traits })
+                    : (class_metaroles => { class => \@traits }),
             );
         }
     }
@@ -260,7 +262,7 @@ Mouse::Exporter - make an import() and unimport() just like Mouse.pm
 
 =head1 VERSION
 
-This document describes Mouse version 0.4501
+This document describes Mouse version 0.49
 
 =head1 SYNOPSIS