1berry/fdroidserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'optional_config' into 'master'

Browse Source 
Make v2 localized config optional

See merge request fdroid/fdroidserver!1649
This commit is contained in:
Michael Pöhn 2025-04-28 11:14:40 +00:00
commit b581d08b6f
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fdroidserver/index.py
View File

@ -681,9 +681,13 @@ def v2_repo(repodict, repodir, archive):
config = common.load_localized_config(CONFIG_CONFIG_NAME, repodir) config = common.load_localized_config(CONFIG_CONFIG_NAME, repodir)
if config: if config:
repo["name"] = config["archive" if archive else "repo"]["name"] localized_config = config["archive" if archive else "repo"]
repo["description"] = config["archive" if archive else "repo"]["description"] if "name" in localized_config:
repo["icon"] = config["archive" if archive else "repo"]["icon"] repo["name"] = localized_config["name"]
if "description" in localized_config:
repo["description"] = localized_config["description"]
if "icon" in localized_config:
repo["icon"] = localized_config["icon"]
repo["address"] = repodict["address"] repo["address"] = repodict["address"]
if "mirrors" in repodict: if "mirrors" in repodict: