From cbd7a010bab15bde09286d7b0d926ae6eb685ba0 Mon Sep 17 00:00:00 2001 From: Ben Roberts Date: Sat, 5 Mar 2016 20:17:19 +0000 Subject: [PATCH 1/2] Fix equo query to prevent dependencies being reinstalled Call to equo query puts arg '--quiet' in the wrong place, receiving prettified output which doesn't match string comparisons against package names, leading to all dependencies being reinstalled every time. This commit puts the --quiet arg in to correct place so that only missing dependencies are installed. --- builder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder b/builder index 2ee7b1f..1c41d52 100755 --- a/builder +++ b/builder @@ -63,7 +63,7 @@ sub calculate_missing { # Getting the package dependencies and the installed packages say "[$package] Getting the package dependencies and the installed packages"; my @Packages = package_deps( $package, $depth, 1 ); - my @Installed_Packages = qx/equo q --quiet list installed/; + my @Installed_Packages = qx/equo q list installed --quiet/; chomp(@Installed_Packages); say "[$package] Getting the package dependencies and the installed packages"; From 3d51d160c5607af5235cba72931b6ab80ea935b1 Mon Sep 17 00:00:00 2001 From: Ben Roberts Date: Sat, 5 Mar 2016 22:47:49 +0000 Subject: [PATCH 2/2] Remove workaround for equery output not being quiet as requested --- builder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder b/builder index 1c41d52..94d2aca 100755 --- a/builder +++ b/builder @@ -69,7 +69,7 @@ sub calculate_missing { #taking only the 4th column of output as key of the hashmap my %installed_packs = - map { ( split( /\s/, $_ ) )[3] => 1 } @Installed_Packages; + map { $_ => 1 } @Installed_Packages; my %available_packs = map { $_ => 1 } available_packages(); # removing from packages the one that are already installed and keeping only the available in the entropy repositories