kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-20 13:50:12 +01:00
Code Activity

Merge branch 'checkupdates_use_hash' into 'master'

Browse Source 
Use hash of tag when adding new version

See merge request fdroid/fdroidserver!956
This commit is contained in:
Jochen Sprickerhof 2021-06-17 11:51:28 +00:00
commit 37e3142610
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fdroidserver/checkupdates.py
View File

@ -217,6 +217,12 @@ def check_tags(app, pattern):
hver = version
if hver:
try:
commit = vcs.getref(htag)
if commit:
return (hver, hcode, commit)
except VCSException:
pass
return (hver, hcode, htag)
return (None, "Couldn't find any version information", None)

15
fdroidserver/common.py
View File

@ -1026,7 +1026,7 @@ class vcs:
"""Get a list of all the known tags, sorted from newest to oldest"""
raise VCSException('latesttags not supported for this vcs type')
def getref(self):
def getref(self, revname=None):
"""Get current commit reference (hash, revision, etc)"""
raise VCSException('getref not supported for this vcs type')
@ -1205,6 +1205,15 @@ class vcs_git(vcs):
tags.append(tag)
return tags
def getref(self, revname='HEAD'):
self.checkrepo()
p = FDroidPopen(['git', 'rev-parse', '--verify',
'{revname}^{{commit}}'.format(revname=revname)], cwd=self.local,
output=False)
if p.returncode != 0:
return None
return p.output.strip()
class vcs_gitsvn(vcs):
@ -1366,9 +1375,9 @@ class vcs_gitsvn(vcs):
if os.path.isdir(d):
return os.listdir(d)
def getref(self):
def getref(self, revname='HEAD'):
self.checkrepo()
p = FDroidPopen(['git', 'svn', 'find-rev', 'HEAD'], cwd=self.local, output=False)
p = FDroidPopen(['git', 'svn', 'find-rev', revname], cwd=self.local, output=False)
if p.returncode != 0:
return None
return p.output.strip()