diff options
| author | Jesse Luehrs <doy@tozt.net> | 2011-01-13 00:43:24 -0600 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2011-01-13 00:43:24 -0600 |
| commit | 288de96a697f56d6a1e4166004e1462837c5aacb (patch) | |
| tree | 2cd17f4f1f8070c3044000c8bfe9e9ffcd11cdb6 | |
| parent | 1ec5bb6133de8f826f1a5978782e1a2d7cf0f2cd (diff) | |
| download | dist-checkconflicts-288de96a697f56d6a1e4166004e1462837c5aacb.tar.gz dist-checkconflicts-288de96a697f56d6a1e4166004e1462837c5aacb.zip | |
actually, we just want to be localizing %CONFLICTS here
| -rw-r--r-- | lib/Dist/CheckConflicts.pm | 8 |
1 files 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; } |