Make fatal the failure to map a dependency to an ebuild

[perl/modules/CPANPLUS-Dist-Gentoo.git] / lib / CPANPLUS / Dist / Gentoo.pm

diff --git a/lib/CPANPLUS/Dist/Gentoo.pm b/lib/CPANPLUS/Dist/Gentoo.pm
index a616e7e7f544689d20fd635558b342cb6db34dc4..70fc27be2dd3797501ea363e526f1261048a5e35 100644 (file)
--- a/lib/CPANPLUS/Dist/Gentoo.pm
+++ b/lib/CPANPLUS/Dist/Gentoo.pm
@@ -270,7 +270,7 @@ sub prepare {
  for my $prereq (sort keys %$prereqs) {
   next if $prereq =~ /^perl(?:-|\z)/;
   my $obj = $int->module_tree($prereq);
-  return $FAIL->('Wrong module object') unless $obj;
+  next unless $obj; # Not in the module tree (e.g. Config)
   next if $obj->package_is_perl_core;
   {
    my $version;
@@ -337,8 +337,23 @@ sub create {
  my $self = shift;
  my $stat = $self->status;
 
- my $OK   = sub { $stat->created(1); $stat->dist($stat->ebuild_file); 1 };
- my $FAIL = sub { $stat->created(0); $stat->dist(undef); $self->_abort(@_) if @_; 0 };
+ my $file;
+
+ my $OK   = sub {
+  $stat->created(1);
+  $stat->dist($file);
+  1;
+ };
+
+ my $FAIL = sub {
+  $stat->created(0);
+  $stat->dist(undef);
+  $self->_abort(@_) if @_;
+  if ($file and -f $file) {
+   1 while unlink $file;
+  }
+  0;
+ };
 
  unless ($stat->prepared) {
   return $FAIL->(
@@ -357,26 +372,30 @@ sub create {
   return $FAIL->("mkpath($dir): $@") if $@;
  }
 
- my $file = $stat->ebuild_file;
- open my $eb, '>', $file or return $FAIL->("open($file): $!");
- print $eb $self->ebuild_source;
- close $eb;
+ $file = $stat->ebuild_file;
+
+ # Create a placeholder ebuild to prevent recursion with circular dependencies.
+ {
+  open my $eb, '>', $file or return $FAIL->("open($file): $!");
+  print $eb "PLACEHOLDER\n";
+ }
 
  $stat->created(0);
  $stat->dist(undef);
 
  $self->SUPER::create(@_);
 
- unless ($stat->created) {
-  1 while unlink $file;
-  return $FAIL->();
- }
+ return $FAIL->() unless $stat->created;
 
- if ($stat->do_manifest and not $self->update_manifest) {
-  1 while unlink $file;
-  return $FAIL->();
+ {
+  open my $eb, '>', $file or return $FAIL->("open($file): $!");
+  my $source = $self->ebuild_source;
+  return $FAIL->() unless defined $source;
+  print $eb $source;
  }
 
+ return $FAIL->() if $stat->do_manifest and not $self->update_manifest;
+
  return $OK->();
 }
 
@@ -406,7 +425,7 @@ sub update_manifest {
 
 =head2 C<ebuild_source>
 
-Returns the source of the ebuild for the current dist object.
+Returns the source of the ebuild for the current dist object, or C<undef> when one of the dependencies couldn't be mapped to an existing ebuild.
 
 =cut
 
@@ -417,11 +436,14 @@ sub ebuild_source {
  # We must resolve the deps now and not inside prepare because _cpan2portage
  # has to see the ebuilds already generated for the dependencies of the current
  # dist.
- my @deps = do {
-  my %seen;
-  sort grep !$seen{$_}++, 'dev-lang/perl',
-                          map $self->_cpan2portage(@$_), @{$stat->deps}
- };
+ my @deps;
+ for (@{$stat->deps}) {
+  my $dep = $self->_cpan2portage(@$_);
+  return unless defined $dep;
+  push @deps, $dep;
+ }
+
+ @deps = do { my %seen; sort grep !$seen{$_}++, 'dev-lang/perl', @deps };
 
  my $d = $stat->header;
  $d   .= "# Generated by CPANPLUS::Dist::Gentoo version $VERSION\n\n";
@@ -465,7 +487,7 @@ sub _cpan2portage {
      my ($eb_ver) = /\Q$atom\E-v?([\d._pr-]+).*?\.ebuild$/;
      return ">=$category/$atom-$ver"
             if  defined $eb_ver
-            and CPANPLUS::Dist::Gentoo::Maps::version_gcmp($eb_ver, $ver) > 0;
+            and CPANPLUS::Dist::Gentoo::Maps::version_gcmp($eb_ver, $ver) >= 0;
     }
    } else {
     return "$category/$atom";
@@ -475,11 +497,11 @@ sub _cpan2portage {
 
  }
 
- $self->_skip(
+ $self->_abort(
   "Couldn't find an appropriate ebuild for $name in the portage tree"
  );
 
- return '';
+ return;
 }
 
 sub install {