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

checkupdates: don't ignore repeated tags

Browse source 
If multiple tags point at the same commit, limiting the regex search to
one tag per line would only catch one tag. This broke org.wikipedia's
update check.
This commit is contained in:
Daniel Martí 2016-03-16 16:40:26 +00:00
parent f57e61821c
commit 23ef5b072a
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
fdroidserver/common.py
View file

@ -705,7 +705,7 @@ class vcs_git(vcs):
p = FDroidPopen(['git', 'tag'], cwd=self.local, output=False) p = FDroidPopen(['git', 'tag'], cwd=self.local, output=False)
return p.output.splitlines() return p.output.splitlines()
tag_format = re.compile(r'.*tag: ([^),]*).*') tag_format = re.compile(r'tag: ([^),]*)')
def latesttags(self): def latesttags(self):
self.checkrepo() self.checkrepo()
@ -714,11 +714,8 @@ class vcs_git(vcs):
cwd=self.local, output=False) cwd=self.local, output=False)
tags = [] tags = []
for line in p.output.splitlines(): for line in p.output.splitlines():
m = self.tag_format.match(line) for tag in self.tag_format.findall(line):
if not m: tags.append(tag)
continue
tag = m.group(1)
tags.append(tag)
return tags return tags