[Catalyst-commits] r10781 - Catalyst-Runtime/5.80/trunk

[rafl at dev.catalyst.perl.org]

Author: rafl
Date: 2009-07-03 23:31:45 +0000 (Fri, 03 Jul 2009)
New Revision: 10781

Modified:
   Catalyst-Runtime/5.80/trunk/Makefile.PL
Log:
Merge branch 'check_conflicts'

* check_conflicts:
  Port to Module::Install::CheckConflicts.
  Create branch check_conflicts

Conflicts:
	Makefile.PL

Modified: Catalyst-Runtime/5.80/trunk/Makefile.PL
===================================================================
--- Catalyst-Runtime/5.80/trunk/Makefile.PL	2009-07-03 23:31:33 UTC (rev 10780)
+++ Catalyst-Runtime/5.80/trunk/Makefile.PL	2009-07-03 23:31:45 UTC (rev 10781)
@@ -93,7 +93,7 @@
         perl -MCPANPLUS -e 'install Catalyst::Devel' # or
         perl -MCPAN -e 'install Catalyst::Devel'
 
-    To get some commonly used plugins, as well as the TT view and DBIC 
+    To get some commonly used plugins, as well as the TT view and DBIC
     model, install Task::Catalyst in the same way.
 
  Have fun!
@@ -146,43 +146,3 @@
                                           ' echo "to avoid getting resource forks in your dist."; exit 255; fi' });
         }
 }
-
-sub check_conflicts {
-    my %conflicts = @_;
-
-    my %conflicts_found;
-    for my $mod ( sort keys %conflicts ) {
-        eval "require($mod)";
-        next if $@;
-
-        my $installed = $mod->VERSION();
-        $conflicts_found{$mod} = $installed if ( $installed le $conflicts{$mod} );
-    }
-
-    return unless scalar keys %conflicts_found;
-
-    print <<"EOF";
-
- WARNING:
-
-    This version of Catalyst conflicts with the versions of
-    some components you have installed.
-
-    You will need to upgrade these modules after installing
-    this version of Catalyst.
-
-    List of the conflicting components and their installed versions:
-
-EOF
-
-    foreach my $mod (keys %conflicts_found) {
-        print sprintf("    %s => %s\n", $mod, $conflicts_found{$mod});
-    }
-    print "\n";
-
-    # More or less copied from Module::Build, via Moose
-    return if $ENV{PERL_MM_USE_DEFAULT};
-    return unless -t STDIN && (-t STDOUT || !(-f STDOUT || -c STDOUT));
-
-    sleep 4;
-}