scripts/feeds: switch to the right feed metadata when installing a package to fix dependency handling (patch by matthijs from #5891)
SVN-Revision: 22815
This commit is contained in:
parent
f9ff9d02f6
commit
76d517b629
1 changed files with 5 additions and 2 deletions
|
@ -307,6 +307,9 @@ sub install_package {
|
|||
return 0;
|
||||
};
|
||||
|
||||
# switch to the metadata for the selected feed
|
||||
get_feed($feed->[1]);
|
||||
|
||||
my $pkg = $feed{$feed->[1]}->{$name} or return 1;
|
||||
$pkg->{name} or do {
|
||||
$installed{$name} and return 0;
|
||||
|
@ -337,8 +340,8 @@ sub install_package {
|
|||
return 1;
|
||||
};
|
||||
|
||||
# install all dependencies
|
||||
foreach my $vpkg (@{$feed_src->{$src}}, $pkg) {
|
||||
# install all dependencies referenced from the source package
|
||||
foreach my $vpkg (@{$feed_src->{$src}}) {
|
||||
foreach my $dep (@{$vpkg->{depends}}, @{$vpkg->{builddepends}}, @{$vpkg->{"builddepends/host"}}) {
|
||||
next if $dep =~ /@/;
|
||||
$dep =~ s/^\+//;
|
||||
|
|
Loading…
Reference in a new issue