From 288de96a697f56d6a1e4166004e1462837c5aacb Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Thu, 13 Jan 2011 00:43:24 -0600
Subject: actually, we just want to be localizing %CONFLICTS here

---
 lib/Dist/CheckConflicts.pm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/Dist/CheckConflicts.pm b/lib/Dist/CheckConflicts.pm
index 0c01bac..f802c10 100644
--- a/lib/Dist/CheckConflicts.pm
+++ b/lib/Dist/CheckConflicts.pm
@@ -139,13 +139,11 @@ sub import {
             $mod =~ s{/}{::}g;
             return unless $mod =~ /[\w:]+/;
 
-            return unless exists $conflicts{$mod};
+            return unless defined $CONFLICTS{$for}
+                       && defined $CONFLICTS{$for}{$mod};
 
             {
-                local @INC = grep {
-                    !(ref($_) eq 'ARRAY' && @$_ > 1 && $_->[1] == \%CONFLICTS)
-                } @INC;
-
+                local $CONFLICTS{$for}{$mod};
                 require $file;
             }
 
-- 
cgit v1.2.3-54-g00ecf