From 7b2adad93177c34f8e4eac1c67cd6ddd1c70a1be Mon Sep 17 00:00:00 2001 From: Ettore Di Giacinto Date: Sun, 18 Jun 2017 12:58:21 +0200 Subject: [PATCH] builder: include also injected_packages in overlays detection --- builder | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/builder b/builder index af49f28..48efde5 100755 --- a/builder +++ b/builder @@ -309,7 +309,10 @@ sub help { say "****************************************************"; -my @parsed_overlays = grep { $_ !~ /gentoo/i } parse_overlays(@ARGV); +my $per_package_useflags; +my @packages = @ARGV; +my @injected_packages = $build_injected_args ? split( / /, $build_injected_args ) : (); +my @parsed_overlays = grep { $_ !~ /gentoo/i } parse_overlays(@packages,@injected_packages); say "Detected overlays: @parsed_overlays" if @parsed_overlays; @@ -475,15 +478,9 @@ if ($use_equo) { system("cp -rf $make_conf /etc/portage/make.conf") if $make_conf; -my $per_package_useflags; -my @packages = @ARGV; -my @injected_packages = (); -if ($build_injected_args) { - @injected_packages = split( / /, $build_injected_args ); - say "[*] Injected installs:"; - - say "\t* " . $_ for @injected_packages; - +if( @injected_packages ) { + say "[*] Injected installs:"; + say "\t* " . $_ for @injected_packages; } # Allow users to specify atoms as: media-tv/kodi[-alsa,avahi]