From: Jesse Luehrs <doy@tozt.net>
Date: Mon, 19 Apr 2010 01:36:37 +0000 (-0500)
Subject: don't whine about unsafe fixing unless we're actually fixing something
X-Git-Tag: 1.02~12
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=f3d0d9438cabec472be3b8633a1a4caf015e418d;hp=3a9318e632e429eb76e16b22c3f0960abe1ccbd7;p=gitmo%2FClass-MOP.git

don't whine about unsafe fixing unless we're actually fixing something
---

diff --git a/lib/Class/MOP/Class.pm b/lib/Class/MOP/Class.pm
index 17b5400..c5359d0 100644
--- a/lib/Class/MOP/Class.pm
+++ b/lib/Class/MOP/Class.pm
@@ -355,11 +355,6 @@ sub _fix_metaclass_incompatibility {
     }
     return unless $necessary;
 
-    ($self->is_pristine)
-        || confess "Can't fix metaclass incompatibility for "
-                 . $self->name
-                 . " because it is not pristine.";
-
     for my $super (map { Class::MOP::Class->initialize($_) } @supers) {
         if (!$self->_class_metaclass_is_compatible($super->name)) {
             $self->_fix_class_metaclass_incompatibility($super);
@@ -384,6 +379,11 @@ sub _fix_class_metaclass_incompatibility {
     my ( $super_meta ) = @_;
 
     if ($self->_can_fix_class_metaclass_incompatibility_by_subclassing($super_meta)) {
+        ($self->is_pristine)
+            || confess "Can't fix metaclass incompatibility for "
+                     . $self->name
+                     . " because it is not pristine.";
+
         my $super_meta_name = $super_meta->is_immutable
                                   ? $super_meta->_get_mutable_metaclass_name
                                   : blessed($super_meta);
@@ -396,6 +396,11 @@ sub _fix_single_metaclass_incompatibility {
     my ( $metaclass_type, $super_meta ) = @_;
 
     if ($self->_can_fix_single_metaclass_incompatibility_by_subclassing($metaclass_type, $super_meta)) {
+        ($self->is_pristine)
+            || confess "Can't fix metaclass incompatibility for "
+                     . $self->name
+                     . " because it is not pristine.";
+
         $self->{$metaclass_type} = $super_meta->$metaclass_type;
     }
 }