maple/prplos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scripts: gen_config.py: keep feed order

Browse Source 
This way custom feeds can override default feeds.

Signed-off-by: Toon Caeyers <toon.caeyers_ext@softathome.com>
This commit is contained in:
Matthias FRANCK 2024-05-07 16:51:30 +02:00 committed by Petr Štetiar
parent bb62747631
commit 191ad535f9
No known key found for this signature in database
GPG Key ID: 58EE120F30CC02D3
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/gen_config.py
View File

@ -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")