Store the verbose flag into the status

[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 43260ba904ade5fadbe969ff9bfc2ca8f4e2373d..34a27a092dbc2e52024af5b13098e22355b3cf21 100644 (file)
--- a/lib/CPANPLUS/Dist/Gentoo.pm
+++ b/lib/CPANPLUS/Dist/Gentoo.pm
@@ -65,9 +65,14 @@ sub format_available {
 sub init {
  my ($self) = @_;
  my $stat = $self->status;
+ my $conf = $self->parent->parent->configure_object;
+
  $stat->mk_accessors(qw/name version dist desc uri src license deps
                         eb_name eb_version eb_dir eb_file distdir fetched_arch
-                        keywords do_manifest/);
+                        keywords do_manifest
+                        verbose/);
+
+ $stat->verbose($conf->get_conf('verbose'));
 
  return 1;
 }
@@ -147,6 +152,7 @@ sub prepare {
  $stat->license([ qw/Artistic GPL-2/ ]);
 
  my $prereqs = $mod->status->prereqs;
+ $prereqs = { map { ($gentooism{$_} || $_) => $prereqs->{$_} } keys %$prereqs };
  my @depends;
  for my $prereq (sort keys %$prereqs) {
   next if $prereq =~ /^perl(?:-|\z)/;
@@ -237,10 +243,16 @@ sub create {
   }
 
   msg 'Adding Manifest entry for ' . $stat->dist;
-  my ($success, $errmsg) = run command => [ 'ebuild', $file, 'manifest' ],
-                               verbose => 0;
+  my ($success, $errmsg, $output) = run
+                                     command => [ 'ebuild', $file, 'manifest' ],
+                                     verbose => 0;
   unless ($success) {
    error "$errmsg -- aborting";
+   if (defined $output and $stat->verbose) {
+    my $msg = join '', @$output;
+    1 while chomp $msg;
+    error $msg;
+   }
    1 while unlink $file;
    return 0;
   }