Skip to content

Commit 14f15f4

Browse files
Erik Karlssonerikrk
authored andcommitted
scripts/feeds: do not warn if override is already installed
When attempting to install a package that is already present in core and -f is not used, suppress the warning about not overriding in case override has already been installed. This avoids spurious warnings caused by dependencies being installed, which is always done without force, or by running "scripts/feeds install -f -p <feed> -a" followed by "scripts/feeds install -a" for example. Signed-off-by: Erik Karlsson <erik.karlsson@genexis.eu>
1 parent 62872f8 commit 14f15f4

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

scripts/feeds

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ $valid_mk or die "Unsupported version of make found: $mk\n";
3232
my @feeds;
3333
my %build_packages;
3434
my %installed;
35+
my %installed_over;
3536
my %installed_pkg;
3637
my %installed_targets;
3738
my %feed_cache;
@@ -285,6 +286,7 @@ sub get_installed() {
285286
parse_package_metadata("./tmp/.packageinfo");
286287
%installed_pkg = %vpackage;
287288
%installed = %srcpackage;
289+
%installed_over = %overrides;
288290
%installed_targets = get_targets("./tmp/.targetinfo");
289291
}
290292

@@ -574,7 +576,7 @@ sub install_src {
574576
my $override = 0;
575577
if (is_core_src($name)) {
576578
if (!$force) {
577-
if ($name ne "toolchain" && $name ne "linux") {
579+
if ($name ne "toolchain" && $name ne "linux" && !$installed_over{$name}) {
578580
warn "WARNING: Not overriding core package '$name'; use -f to force\n";
579581
}
580582
return 0;
@@ -596,6 +598,7 @@ sub install_src {
596598
}
597599

598600
if ($override) {
601+
$installed_over{$name} = 1;
599602
warn "Overriding core package '$name' with version from $select_feed->[1]\n";
600603
} else {
601604
warn "Installing package '$name' from $select_feed->[1]\n";

0 commit comments

Comments
 (0)