Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 5a19da9db7 | |||
| 523146cf2b | |||
| 7bff7825d6 | |||
| 114eb47a4b |
@@ -241,6 +241,13 @@ if ($use_equo) {
|
||||
my @Installed_Packages = qx/equo q list installed --quiet/;
|
||||
my @Available_Packages = available_packages();
|
||||
chomp(@Installed_Packages);
|
||||
|
||||
my %installed_packs =
|
||||
map { $_ => 1 } @Installed_Packages;
|
||||
|
||||
# Remove any already installed packages from the list of entropy packages to install in the build spec
|
||||
@equo_install = grep { ! exists $installed_packs{$_} } @equo_install;
|
||||
|
||||
foreach my $p (@packages) {
|
||||
say "[$p] Getting the package dependencies which aren't already installed on the system.. ";
|
||||
push( @packages_deps, calculate_missing( $p , $dep_scan_depth,\@Installed_Packages,\@Available_Packages) )
|
||||
|
||||
@@ -37,6 +37,7 @@ docker_volumes=( -v "$OUTPUT_DIR:/usr/portage/packages" )
|
||||
[ -z "$ARTIFACTS_DIR" ] || docker_env+=(-e "ARTIFACTS_DIR=$ARTIFACTS_DIR")
|
||||
[ -z "$ENTROPY_REPOSITORY" ] || docker_env+=(-e "ENTROPY_REPOSITORY=$ENTROPY_REPOSITORY")
|
||||
[ -z "$SKIP_PORTAGE_SYNC" ] || docker_env+=(-e "SKIP_PORTAGE_SYNC=$SKIP_PORTAGE_SYNC")
|
||||
[ -z "$EQUO_MIRRORSORT" ] || docker_env+=(-e "EQUO_MIRRORSORT=$EQUO_MIRRORSORT")
|
||||
[ -z "$WEBRSYNC" ] || docker_env+=(-e "WEBRSYNC=$WEBRSYNC")
|
||||
[ -z "$ENMAN_REPOSITORIES" ] || docker_env+=(-e "ENMAN_REPOSITORIES=$ENMAN_REPOSITORIES")
|
||||
[ -z "$DISTFILES" ] || docker_volumes+=(-v "$DISTFILES:/usr/portage/distfiles")
|
||||
|
||||
Reference in New Issue
Block a user