Nanako/openwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scripts/feeds: fix preference of package install

Browse Source 
The previous behavior prefered same feed for dependent packages as
initial package. This caused inconsitency in installation of packages.
The difference was if two feeds provide same package (different version)
there was different result if you executed install for that specific
version compared to install for package depending on it from different
feed.

This ensures that preferred feed is propagated without change and
selected feed is used only really for package it was selected for.

Signed-off-by: Karel Kočí <karel.koci@nic.cz>
This commit is contained in:
Karel Kočí 2019-12-10 13:04:19 +01:00 committed by Paul Spooren
parent 6ea03ec94c
commit a3e5b24d43
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
scripts/feeds
View File

@ -517,19 +517,19 @@ sub install_src {
my $force = shift; my $force = shift;
my $ret = 0; my $ret = 0;
$feed = lookup_src($feed, $name); my $select_feed = lookup_src($feed, $name);
unless ($feed) { unless ($select_feed) {
$installed{$name} and return 0; $installed{$name} and return 0;
$feed_src->{$name} or warn "WARNING: No feed for source package '$name' found\n"; $feed_src->{$name} or warn "WARNING: No feed for source package '$name' found\n";
return 0; return 0;
} }
# switch to the metadata for the selected feed # switch to the metadata for the selected feed
get_feed($feed->[1]); get_feed($select_feed->[1]);
my $src = $feed_src->{$name} or return 1; my $src = $feed_src->{$name} or return 1;
# enable force flag if feed src line was declared with --force # enable force flag if feed src line was declared with --force
if (exists($feed->[3]{force})) { if (exists($select_feed->[3]{force})) {
$force = 1; $force = 1;
} }
@ -557,12 +557,12 @@ sub install_src {
} }
if ($override) { if ($override) {
warn "Overriding core package '$name' with version from $feed->[1]\n"; warn "Overriding core package '$name' with version from $select_feed->[1]\n";
} else { } else {
warn "Installing package '$name' from $feed->[1]\n"; warn "Installing package '$name' from $select_feed->[1]\n";
} }
do_install_src($feed, $src) == 0 or do { do_install_src($select_feed, $src) == 0 or do {
warn "failed.\n"; warn "failed.\n";
return 1; return 1;
}; };
@ -597,15 +597,15 @@ sub install_package {
my $name = shift; my $name = shift;
my $force = shift; my $force = shift;
$feed = lookup_package($feed, $name); my $select_feed = lookup_package($feed, $name);
unless ($feed) { unless ($select_feed) {
$installed_pkg{$name} and return 0; $installed_pkg{$name} and return 0;
$feed_vpackage->{$name} or warn "WARNING: No feed for package '$name' found\n"; $feed_vpackage->{$name} or warn "WARNING: No feed for package '$name' found\n";
return 0; return 0;
} }
# switch to the metadata for the selected feed # switch to the metadata for the selected feed
get_feed($feed->[1]); get_feed($select_feed->[1]);
my $pkg = $feed_vpackage->{$name} or return 1; my $pkg = $feed_vpackage->{$name} or return 1;
return install_src($feed, $pkg->[0]{src}{name}, $force); return install_src($feed, $pkg->[0]{src}{name}, $force);
} }
@ -615,14 +615,12 @@ sub install_target_or_package {
my $name = shift; my $name = shift;
my $force = shift; my $force = shift;
my $this_feed_target = lookup_target($feed, $name); lookup_target($feed, $name) and do {
$this_feed_target and do { return install_target($feed, $name);
return install_target($this_feed_target, $name);
}; };
my $this_feed_src = lookup_src($feed, $name); lookup_src($feed, $name) and do {
$this_feed_src and do { return install_src($feed, $name, $force);
return install_src($this_feed_src, $name, $force);
}; };
return install_package($feed, $name, $force); return install_package($feed, $name, $force);