X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FRole%2FTiny.pm;h=21688d4c2da07d56b71df39f0f21ecefcb74bd67;hb=c0978659eb62dce7d946dd78b0fd1a720947be99;hp=0ed72983c0c6aae5a90234f00a8b1158a6917c33;hpb=2603ea93c8af870757f38ce7e7f2a944c29070f2;p=gitmo%2FRole-Tiny.git

diff --git a/lib/Role/Tiny.pm b/lib/Role/Tiny.pm
index 0ed7298..21688d4 100644
--- a/lib/Role/Tiny.pm
+++ b/lib/Role/Tiny.pm
@@ -74,12 +74,11 @@ sub import {
 }
 
 sub role_application_steps {
-  qw(_install_methods _install_modifiers _check_requires _copy_applied_list);
+  qw(_install_methods _check_requires _install_modifiers _copy_applied_list);
 }
 
 sub apply_single_role_to_package {
   my ($me, $to, $role) = @_;
-  return if our $SKIP_APPLY;
 
   _load_module($role);
 
@@ -208,14 +207,15 @@ sub apply_roles_to_package {
         && $me->can('apply_single_role_to_package')
           != \&apply_single_role_to_package
   ) {
-    local our $SKIP_APPLY = 1;
     foreach my $role (@roles) {
       $me->apply_single_role_to_package($to, $role);
     }
   }
-  foreach my $step ($me->role_application_steps) {
-    foreach my $role (@roles) {
-      $me->$step($to, $role);
+  else {
+    foreach my $step ($me->role_application_steps) {
+      foreach my $role (@roles) {
+        $me->$step($to, $role);
+      }
     }
   }
   $APPLIED_TO{$to}{join('|',@roles)} = 1;