mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-04 06:30:27 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'checkupdates-fix-get_upstream_main_branch' into 'master'

Browse source 
checkupdates: fix get_upstream_main_branch() for Debian/forky

See merge request fdroid/fdroidserver!1702
This commit is contained in:
linsui 2025-09-18 10:57:09 +00:00
commit 9b8a334dcf
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
fdroidserver/checkupdates.py
View file

@ -691,11 +691,15 @@ def get_last_build_from_app(app: metadata.App) -> metadata.Build:
def get_upstream_main_branch(git_repo): def get_upstream_main_branch(git_repo):
if len(git_repo.remotes.upstream.refs) == 1: refs = list()
return git_repo.remotes.upstream.refs[0].name for ref in git_repo.remotes.upstream.refs:
for name in ('main', 'master'): if ref.name != 'upstream/HEAD':
if name in git_repo.remotes.upstream.refs: refs.append(ref.name)
return f'upstream/{name}' if len(refs) == 1:
return refs[0]
for name in ('upstream/main', 'upstream/master'):
if name in refs:
return name
try: try:
with git_repo.config_reader() as reader: with git_repo.config_reader() as reader:
return 'upstream/%s' % reader.get_value('init', 'defaultBranch') return 'upstream/%s' % reader.get_value('init', 'defaultBranch')