[ci skip]

Author: skaji

lib/App/cpm/Distribution.pm

@@ -2,7 +2,6 @@ package App::cpm::Distribution;
 use strict;
 use warnings;
 
-use App::cpm::Logger;
 use App::cpm::Requirement;
 use App::cpm::version;
 use CPAN::DistnameInfo;
@@ -145,16 +144,15 @@ sub providing {
     for my $provide (@{$self->provides}) {
         if ($provide->{package} eq $package) {
             if (!$version_range or App::cpm::version->parse($provide->{version})->satisfy($version_range)) {
-                return 1;
+                return (1, undef);
             } else {
-                my $message = sprintf "%s provides %s (%s), but needs %s\n",
+                my $err = sprintf "%s provides %s (%s), but needs %s\n",
                     $self->distfile, $package, $provide->{version} || 0, $version_range;
-                App::cpm::Logger->log(result => "WARN", message => $message);
-                last;
+                return (undef, $err);
             }
         }
     }
-    return;
+    return (undef, undef);
 }
 
 sub equals {

lib/App/cpm/Master.pm

@@ -41,7 +41,7 @@ sub new {
         } else {
             my $msg = "You don't have Module::CoreList. "
                     . "The local-lib may result in incomplete self-contained directory.";
-            App::cpm::Logger->log(result => "WARN", message => $msg);
+            warn "$msg\n";
         }
     }
     $self;
@@ -245,7 +245,6 @@ sub _calculate_tasks {
                 my $msg = sprintf "%s requires perl %s, but you have only %s",
                     $dist->distvname, $req->{version_range}, $self->{target_perl} || $];
                 $self->{logger}->log($msg);
-                App::cpm::Logger->log(result => "FAIL", message => $msg);
                 $self->{_fail_install}{$dist->distfile}++;
             }
         }
@@ -283,7 +282,6 @@ sub _calculate_tasks {
                 my $msg = sprintf "%s requires perl %s, but you have only %s",
                     $dist->distvname, $req->{version_range}, $self->{target_perl} || $];
                 $self->{logger}->log($msg);
-                App::cpm::Logger->log(result => "FAIL", message => $msg);
                 $self->{_fail_install}{$dist->distfile}++;
             }
         }
@@ -349,14 +347,7 @@ sub is_core {
     my $target_perl = $self->{target_perl};
     if (exists $Module::CoreList::version{$target_perl}{$package}) {
         if (!exists $Module::CoreList::version{$]}{$package}) {
-            if (!$self->{_removed_core}{$package}++) {
-                my $t = App::cpm::version->parse($target_perl)->normal;
-                my $v = App::cpm::version->parse($])->normal;
-                App::cpm::Logger->log(
-                    result => "WARN",
-                    message => "$package used to be core in $t, but not in $v, so will be installed",
-                );
-            }
+            # $package used to be core in $target_perl, but not in $], so will be installed
             return;
         }
         return 1 unless $version_range;
@@ -382,7 +373,19 @@ sub is_satisfied {
         }
         next if $self->{target_perl} and $self->is_core($package, $version_range);
         next if $self->is_installed($package, $version_range);
-        my ($resolved) = grep { $_->providing($package, $version_range) } @distributions;
+
+        my $resolved;
+        for my $dist (@distributions) {
+            my ($ok, $err) = $dist->providing($package, $version_range);
+            if ($ok) {
+                $resolved = $dist;
+                last;
+            }
+            if ($err) {
+                $self->{logger}->log($err);
+                last;
+            }
+        }
         next if $resolved && $resolved->installed;
 
         $is_satisfied = 0 if defined $is_satisfied;
@@ -416,11 +419,6 @@ sub _register_resolve_result {
     if ($task->{distfile} and $task->{distfile} =~ m{/perl-5[^/]+$}) {
         my $message = "$task->{package} is a core module.";
         $self->{logger}->log($message);
-        App::cpm::Logger->log(
-            result => "DONE",
-            type => "install",
-            message => $message,
-        );
         return;
     }
 
@@ -434,11 +432,6 @@ sub _register_resolve_result {
                 : " is up to date. ($local)"
             );
             $self->{logger}->log($message);
-            App::cpm::Logger->log(
-                result => "DONE",
-                type => "install",
-                message => $message,
-            );
             return;
         }
     }