Make the overlay and the distdir absolute. Cwd is required

diff --git a/Makefile.PL b/Makefile.PL
index 152179acf00e3ab975be345aba4fdc2a41cda5fd..7101df28361a98cd3729953516631465e5dce3dd 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -28,6 +28,7 @@ WriteMakefile(
     PL_FILES      => {},
     PREREQ_PM     => {
         'CPANPLUS'              => 0,
+        'Cwd'                   => 0,
         'File::Copy'            => 0,
         'File::Path'            => 0,
         'File::Spec::Functions' => 0,

diff --git a/lib/CPANPLUS/Dist/Gentoo.pm b/lib/CPANPLUS/Dist/Gentoo.pm
index ee6c6129386951200413a8c96b260e1f9fabd863..fda4b054b8fb67c9c32911fa0db1452f73e0c4ef 100644 (file)
--- a/lib/CPANPLUS/Dist/Gentoo.pm
+++ b/lib/CPANPLUS/Dist/Gentoo.pm
@@ -3,6 +3,7 @@ package CPANPLUS::Dist::Gentoo;
 use strict;
 use warnings;
 
+use Cwd qw/abs_path/;
 use File::Copy qw/copy/;
 use File::Path qw/mkpath/;
 use File::Spec::Functions qw/catdir catfile/;
@@ -126,9 +127,13 @@ sub prepare {
  }
  $stat->footer($footer);
 
- $stat->overlay(delete($opts{'overlay'}) || '/usr/local/portage');
+ my $overlay = delete $opts{'overlay'};
+ $overlay = (defined $overlay) ? abs_path $overlay : '/usr/local/portage';
+ $stat->overlay($overlay);
 
- $stat->distdir(delete($opts{'distdir'}) || '/usr/portage/distfiles');
+ my $distdir = delete $opts{'distdir'};
+ $distdir = (defined $distdir) ? abs_path $distdir : '/usr/portage/distfiles';
+ $stat->distdir($distdir);
 
  if ($stat->do_manifest && !-w $stat->distdir) {
   error 'distdir isn\'t writable -- aborting';
@@ -358,7 +363,7 @@ Gentoo (L<http://gentoo.org>).
 
 L<CPANPLUS>, L<IPC::Cmd> (core modules since 5.9.5).
 
-L<File::Path> (since 5.001), L<File::Copy> (5.002), L<File::Spec::Functions> (5.00504).
+L<Cwd> (since perl 5) L<File::Path> (5.001), L<File::Copy> (5.002), L<File::Spec::Functions> (5.00504).
 
 =head1 SEE ALSO