summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2011-01-02 07:13:20 -0600
committerJesse Luehrs <doy@tozt.net>2011-01-02 07:25:43 -0600
commit6e6576fe178702a9ea224908d46028ad913e0acb (patch)
tree37c0c38af3cb087cd8d9e61776cd0508c4b0a598
parenta9bd383c0cb1207286c776cf03e1d67f461ba1bc (diff)
downloaddist-checkconflicts-6e6576fe178702a9ea224908d46028ad913e0acb.tar.gz
dist-checkconflicts-6e6576fe178702a9ea224908d46028ad913e0acb.zip
check Foo::Conflicts if 'Foo' is given as 'also'
-rw-r--r--lib/Dist/CheckConflicts.pm7
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/Dist/CheckConflicts.pm b/lib/Dist/CheckConflicts.pm
index 32da3b1..0c2907f 100644
--- a/lib/Dist/CheckConflicts.pm
+++ b/lib/Dist/CheckConflicts.pm
@@ -99,6 +99,13 @@ sub import {
my %conflicts = %{ $conflicts || {} };
for my $also (@{ $alsos || [] }) {
eval "require $also; 1;" or next;
+ if (!exists $CONFLICTS{$also}) {
+ $also .= '::Conflicts';
+ eval "require $also; 1;" or next;
+ }
+ if (!exists $CONFLICTS{$also}) {
+ next;
+ }
my %also_confs = $also->conflicts;
for my $also_conf (keys %also_confs) {
$conflicts{$also_conf} = $also_confs{$also_conf}