X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FCPANPLUS%2FDist%2FGentoo.pm;h=54ccae0767ba1f67c110d4f3d669f38f2ccf15b0;hb=0033ad2c4e2e6b1bde6ccf8e3873d76f0574b7fd;hp=34a27a092dbc2e52024af5b13098e22355b3cf21;hpb=1b3ef6837ed5076bbf9b6ad7f3de2a02cdd4a977;p=perl%2Fmodules%2FCPANPLUS-Dist-Gentoo.git

diff --git a/lib/CPANPLUS/Dist/Gentoo.pm b/lib/CPANPLUS/Dist/Gentoo.pm
index 34a27a0..54ccae0 100644
--- a/lib/CPANPLUS/Dist/Gentoo.pm
+++ b/lib/CPANPLUS/Dist/Gentoo.pm
@@ -68,10 +68,11 @@ sub init {
  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
-                        verbose/);
+                        eb_name eb_version eb_dir eb_file fetched_arch
+                        overlay distdir keywords do_manifest
+                        force verbose/);
 
+ $stat->force($conf->get_conf('force'));
  $stat->verbose($conf->get_conf('verbose'));
 
  return 1;
@@ -108,6 +109,7 @@ sub prepare {
 
  my $overlay = catdir(delete($opts{'overlay'}) || '/usr/local/portage',
                       CATEGORY);
+ $stat->overlay($overlay);
 
  $stat->distdir(delete($opts{'distdir'}) || '/usr/portage/distfiles');
  if ($stat->do_manifest && !-w $stat->distdir) {
@@ -129,13 +131,28 @@ sub prepare {
 
  $stat->eb_name($gentooism{$stat->name} || $stat->name);
  $stat->eb_dir(catdir($overlay, $stat->eb_name));
- $stat->eb_file(catfile($stat->eb_dir,
-                        $stat->eb_name . '-' . $stat->eb_version . '.ebuild'));
- if (-r $stat->eb_file) {
-  msg 'Ebuild already generated for ' . $stat->dist . ' -- skipping';
-  $stat->prepared(1);
-  $stat->created(1);
-  return 1;
+
+ my $file = catfile($stat->eb_dir,
+                    $stat->eb_name . '-' . $stat->eb_version . '.ebuild');
+ $stat->eb_file($file);
+
+ if (-e $file) {
+  my $skip = 1;
+  if ($stat->force) {
+   if (-w $file) {
+    1 while unlink $file;
+    $skip = 0;
+   } else {
+    error "Can't force rewriting of $file -- skipping";
+   }
+  } else {
+   msg 'Ebuild already generated for ' . $stat->dist . ' -- skipping';
+  }
+  if ($skip) {
+   $stat->prepared(1);
+   $stat->created(1);
+   return 1;
+  }
  }
 
  $self->SUPER::prepare(%opts);
@@ -243,16 +260,7 @@ sub create {
   }
 
   msg 'Adding Manifest entry for ' . $stat->dist;
-  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;
-   }
+  unless ($self->_run([ 'ebuild', $file, 'manifest' ], 0)) {
    1 while unlink $file;
    return 0;
   }
@@ -270,14 +278,7 @@ sub install {
  my @cmd = ('emerge', '=' . $stat->eb_name . '-' . $stat->eb_version);
  unshift @cmd, $sudo if $sudo;
 
- my ($success, $errmsg) = run command => \@cmd,
-                              verbose => 1;
- unless ($success) {
-  error "$errmsg -- aborting";
-  return 0;
- }
-
- return 1;
+ return $self->_run(\@cmd, 1);
 }
 
 sub uninstall {
@@ -289,14 +290,29 @@ sub uninstall {
  my @cmd = ('emerge', '-C', '=' . $stat->eb_name . '-' . $stat->eb_version);
  unshift @cmd, $sudo if $sudo;
 
- my ($success, $errmsg) = run command => \@cmd,
-                              verbose => 1;
+ return $self->_run(\@cmd, 1);
+}
+
+sub _run {
+ my ($self, $cmd, $verbose) = @_;
+ my $stat = $self->status;
+
+ my ($success, $errmsg, $output) = do {
+  local $ENV{PORTDIR_OVERLAY}     = $stat->overlay;
+  local $ENV{PORTAGE_RO_DISTDIRS} = $stat->distdir;
+  run command => $cmd, verbose => $verbose;
+ };
+
  unless ($success) {
   error "$errmsg -- aborting";
-  return 0;
+  if (not $verbose and defined $output and $self->status->verbose) {
+   my $msg = join '', @$output;
+   1 while chomp $msg;
+   error $msg;
+  }
  }
 
- return 1;
+ return $success;
 }
 
 =head1 DEPENDENCIES