[openwrt/openwrt] scripts/feeds: warn when skipping core package override

LEDE Commits lede-commits at lists.infradead.org
Wed Dec 9 16:30:38 EST 2020


aparcar pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/7f285d0b436c4b05a89c78ef3f1910d6f78040da

commit 7f285d0b436c4b05a89c78ef3f1910d6f78040da
Author: Brian Norris <computersforpeace at gmail.com>
AuthorDate: Fri Jul 3 19:51:57 2020 -0700

    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 at gmail.com>
---
 scripts/feeds | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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;
 	}
 



More information about the lede-commits mailing list