From: Brian Norris <computersforpeace@gmail.com>
Date: Sat, 4 Jul 2020 02:51:57 +0000 (-0700)
Subject: scripts/feeds: warn when skipping core package override
X-Git-Tag: v21.02.0-rc1~870
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7f285d0b436c4b05a89c78ef3f1910d6f78040da;p=openwrt%2Fstaging%2Fchunkeey.git

scripts/feeds: warn when skipping core package override

Otherwise, a n00b like myself can get quite confused when moving a
package from core to feeds, for example.

(Hint: one *really* needs to clear out the tmp/info/.packageinfo...
entries for the stale package, but '-f' works as well.)

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
---

diff --git a/scripts/feeds b/scripts/feeds
index 22d4f8e8f4..e402200194 100755
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -536,7 +536,10 @@ sub install_src {
 	# If it's a core package and we don't want to override, just return
 	my $override = 0;
 	if (is_core_src($name)) {
-		return 0 unless $force;
+		if (!$force) {
+			warn "Not overriding core package $name; use -f to force\n";
+			return 0;
+		}
 		$override = 1;
 	}