my $overlays;
my $default_keywords;
+my $default_distdir;
+
+sub _unquote {
+ my $s = shift;
+ $s =~ s/^["']*//;
+ $s =~ s/["']*$//;
+ return $s;
+}
sub format_available {
for my $prog (qw/emerge ebuild/) {
if ($success) {
for (@{$output || []}) {
if (/^PORTDIR_OVERLAY=(.*)$/m) {
- my $o = $1;
- $o =~ s/^["']*//;
- $o =~ s/["']*$//;
- $overlays = [ map abs_path($_), split ' ', $o ];
+ $overlays = [ map abs_path($_), split ' ', _unquote($1) ];
}
if (/^ACCEPT_KEYWORDS=(.*)$/m) {
- my $k = $1;
- $k =~ s/^["']*//;
- $k =~ s/["']*$//;
- $default_keywords = [ split ' ', $k ];
+ $default_keywords = [ split ' ', _unquote($1) ];
+ }
+ if (/^DISTDIR=(.*)$/m) {
+ $default_distdir = abs_path(_unquote($1));
}
}
} else {
}
$default_keywords = [ 'x86' ] unless defined $default_keywords;
+ $default_distdir = '/usr/portage/distfiles' unless defined $default_distdir;
return 1;
}
return 1;
}
-my %gentooism = (
+our %gentooism = (
'ANSIColor' => 'Term-ANSIColor',
'Audio-CD' => 'Audio-CD-disc-cover',
'CGI-Simple' => 'Cgi-Simple',
$stat->overlay($overlay);
my $distdir = delete $opts{'distdir'};
- $distdir = (defined $distdir) ? abs_path $distdir : '/usr/portage/distfiles';
+ $distdir = (defined $distdir) ? abs_path $distdir : $default_distdir;
$stat->distdir($distdir);
if ($stat->do_manifest && !-w $stat->distdir) {
my $portdir_overlay;
for (@$overlays) {
if ($_ eq $overlay or File::Spec::Functions::abs2rel($overlay, $_) eq $cur) {
- $portdir_overlay = join ' ', @$overlays;
+ $portdir_overlay = [ @$overlays ];
last;
}
}
- $portdir_overlay = join ' ', @$overlays, $overlay
- unless defined $portdir_overlay;
+ $portdir_overlay = [ @$overlays, $overlay ] unless $portdir_overlay;
$stat->portdir_overlay($portdir_overlay);
my $name = $mod->package_name;
my $stat = $self->status;
my ($success, $errmsg, $output) = do {
- local $ENV{PORTDIR_OVERLAY} = $stat->portdir_overlay;
+ local $ENV{PORTDIR_OVERLAY} = join ' ', @{$stat->portdir_overlay};
local $ENV{PORTAGE_RO_DISTDIRS} = $stat->distdir;
run command => $cmd, verbose => $verbose;
};