qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-02-17 15:34:43 +02:00
Code

scripts/feeds: switch to the right feed metadata when installing a package to fix dependency handling (patch by matthijs from #5891)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22815 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2010-08-26 15:13:47 +00:00
parent 5e82366ac7
commit 30d6c703dc
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/feeds
View File

@ -307,6 +307,9 @@ sub install_package {
return 0; return 0;
}; };
# switch to the metadata for the selected feed
get_feed($feed->[1]);
my $pkg = $feed{$feed->[1]}->{$name} or return 1; my $pkg = $feed{$feed->[1]}->{$name} or return 1;
$pkg->{name} or do { $pkg->{name} or do {
$installed{$name} and return 0; $installed{$name} and return 0;
@ -337,8 +340,8 @@ sub install_package {
return 1; return 1;
}; };
# install all dependencies # install all dependencies referenced from the source package
foreach my $vpkg (@{$feed_src->{$src}}, $pkg) { foreach my $vpkg (@{$feed_src->{$src}}) {
foreach my $dep (@{$vpkg->{depends}}, @{$vpkg->{builddepends}}, @{$vpkg->{"builddepends/host"}}) { foreach my $dep (@{$vpkg->{depends}}, @{$vpkg->{builddepends}}, @{$vpkg->{"builddepends/host"}}) {
next if $dep =~ /@/; next if $dep =~ /@/;
$dep =~ s/^\+//; $dep =~ s/^\+//;