From: Graham Knop <haarg@haarg.org>
Date: Thu, 11 Jul 2013 08:43:52 +0000 (-0400)
Subject: don't attempt to fix mutual requires for subclasses that rely on backcompat
X-Git-Tag: v1.003000~11
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=113e7b428f52d436ba2cd7a2d80fde3a1a260c06;p=gitmo%2FRole-Tiny.git

don't attempt to fix mutual requires for subclasses that rely on backcompat
---

diff --git a/lib/Role/Tiny.pm b/lib/Role/Tiny.pm
index 0ed7298..a1a0ec6 100644
--- a/lib/Role/Tiny.pm
+++ b/lib/Role/Tiny.pm
@@ -79,7 +79,6 @@ sub role_application_steps {
 
 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;