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 9cc12502252ccdbfb8cc707ebf3f25effe3b5aca..70fc27be2dd3797501ea363e526f1261048a5e35 100644 (file)
--- a/lib/CPANPLUS/Dist/Gentoo.pm
+++ b/lib/CPANPLUS/Dist/Gentoo.pm
@@ -147,7 +147,7 @@ sub prepare {
  my $OK   = sub { $stat->prepared(1); 1 };
  my $FAIL = sub { $stat->prepared(0); $self->_abort(@_) if @_; 0 };
 
- my $keywords = delete $opts{'keywords'};
+ my $keywords = delete $opts{keywords};
  if (defined $keywords) {
   $keywords = [ split ' ', $keywords ];
  } else {
@@ -155,12 +155,12 @@ sub prepare {
  }
  $stat->keywords($keywords);
 
- my $manifest = delete $opts{'manifest'};
+ my $manifest = delete $opts{manifest};
  $manifest = 1 unless defined $manifest;
  $manifest = 0 if $manifest =~ /^\s*no?\s*$/i;
  $stat->do_manifest($manifest);
 
- my $header = delete $opts{'header'};
+ my $header = delete $opts{header};
  if (defined $header) {
   1 while chomp $header;
   $header .= "\n\n";
@@ -169,7 +169,7 @@ sub prepare {
  }
  $stat->header($header);
 
- my $footer = delete $opts{'footer'};
+ my $footer = delete $opts{footer};
  if (defined $footer) {
   $footer = "\n" . $footer;
  } else {
@@ -177,17 +177,16 @@ sub prepare {
  }
  $stat->footer($footer);
 
- my $overlay = delete $opts{'overlay'};
+ my $overlay = delete $opts{overlay};
  $overlay = (defined $overlay) ? abs_path $overlay : '/usr/local/portage';
  $stat->overlay($overlay);
 
- my $distdir = delete $opts{'distdir'};
+ my $distdir = delete $opts{distdir};
  $distdir = (defined $distdir) ? abs_path $distdir : $default_distdir;
  $stat->distdir($distdir);
 
- if ($stat->do_manifest && !-w $stat->distdir) {
-  return $FAIL->('distdir isn\'t writable');
- }
+ return $FAIL->("distdir isn't writable") if $stat->do_manifest && !-w $distdir;
+
  $stat->fetched_arch($mod->status->fetch);
 
  my $cur = File::Spec->curdir();
@@ -261,11 +260,8 @@ sub prepare {
 
  $stat->uri('http://search.cpan.org/dist/' . $name);
 
- unless ($author =~ /^(.)(.)/) {
-  return $FAIL->('Wrong author name');
- }
- $stat->src("mirror://cpan/modules/by-authors/id/$1/$1$2/$author/"
-            . $mod->package);
+ $author =~ /^(.)(.)/ or return $FAIL->('Wrong author name');
+ $stat->src("mirror://cpan/modules/by-authors/id/$1/$1$2/$author/" . $mod->package);
 
  $stat->license($self->intuit_license);
 
@@ -274,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;
@@ -317,6 +313,7 @@ sub intuit_license {
   my @licenses = CPANPLUS::Dist::Gentoo::Maps::license_c2g($dslip_license{$1});
   return \@licenses if @licenses;
  }
+
  my $extract_dir = $mod->status->extract;
 
  for my $meta_file (qw/META.json META.yml/) {
@@ -340,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->(
@@ -360,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->();
 }
 
@@ -409,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
 
@@ -420,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";
@@ -468,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";
@@ -478,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 {