From 191ad535f94746bf5ec011122fda9a248b03b9a2 Mon Sep 17 00:00:00 2001 From: Matthias FRANCK Date: Tue, 7 May 2024 16:51:30 +0200 Subject: [PATCH] scripts: gen_config.py: keep feed order This way custom feeds can override default feeds. Signed-off-by: Toon Caeyers --- scripts/gen_config.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/gen_config.py b/scripts/gen_config.py index f2329a9100..155418916c 100755 --- a/scripts/gen_config.py +++ b/scripts/gen_config.py @@ -167,12 +167,6 @@ if feeds_conf.is_file(): feeds = [] -with open("feeds.conf.default", "r") as default_feeds: - for line in default_feeds: - feed = line.rstrip() - print(f"Adding default feed '{feed}'") - feeds.append(feed.replace(" ", ",")) - for p in profile.get("feeds", []): try: profile_feeds = profile["feeds"].get(p) @@ -181,6 +175,12 @@ for p in profile.get("feeds", []): print(f"Badly configured feed: {profile_feeds}") quit(1) +with open("feeds.conf.default", "r") as default_feeds: + for line in default_feeds: + feed = line.rstrip() + print(f"Adding default feed '{feed}'") + feeds.append(feed.replace(" ", ",")) + if run_cmd(["./scripts/feeds", "setup", *feeds]).returncode: die(f"Error setting up feeds")