sablink/devkit
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[builder] reverting virtual exclusion, prevents building and end in an infinite loop

Browse Source
This commit is contained in:
mudler
2016-03-15 11:05:19 +01:00
parent a4ce1e8300
commit c17228fc05
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
builder
+13 -11
View File
@@ -70,17 +70,19 @@ sub calculate_missing {
# Getting the package dependencies and the installed packages
say "[$package] Getting the package dependencies and the installed packages";
my @dependencies = package_deps( $package, $depth, 1 );
my %install_dependencies = map { $_ => 1 } @dependencies;
# Look for any virtuals and remove its immediate dependencies to avoid
# installing multiple conflicting packages one by one
my @virtual_deps;
for my $dep (@dependencies) {
push(@virtual_deps, package_deps( $dep, 1, 1 )) if ( $dep =~ /^virtual\// );
}
for my $dep (@virtual_deps) {
$install_dependencies{$dep} = 0 if ( $dep !~ /^virtual\// );
}
@dependencies = grep { $install_dependencies{$_} } @dependencies;
# XXX: Endless loop as for now.
# my %install_dependencies = map { $_ => 1 } @dependencies;
# # Look for any virtuals and remove its immediate dependencies to avoid
# # installing multiple conflicting packages one by one
# my @virtual_deps;
# for my $dep (@dependencies) {
# push(@virtual_deps, package_deps( $dep, 1, 1 )) if ( $dep =~ /^virtual\// );
# }
# for my $dep (@virtual_deps) {
# $install_dependencies{$dep} = 0 if ( $dep !~ /^virtual\// );
# }
# @dependencies = grep { $install_dependencies{$_} } @dependencies;
#taking only the 4th column of output as key of the hashmap
my %installed_packs =