From 23ef5b072aa944ffcdadb09c66ca882bb98a29db Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Wed, 16 Mar 2016 16:40:26 +0000 Subject: [PATCH] checkupdates: don't ignore repeated tags 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. --- fdroidserver/common.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 9b6f303d..725c7961 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -705,7 +705,7 @@ class vcs_git(vcs): p = FDroidPopen(['git', 'tag'], cwd=self.local, output=False) return p.output.splitlines() - tag_format = re.compile(r'.*tag: ([^),]*).*') + tag_format = re.compile(r'tag: ([^),]*)') def latesttags(self): self.checkrepo() @@ -714,11 +714,8 @@ class vcs_git(vcs): cwd=self.local, output=False) tags = [] for line in p.output.splitlines(): - m = self.tag_format.match(line) - if not m: - continue - tag = m.group(1) - tags.append(tag) + for tag in self.tag_format.findall(line): + tags.append(tag) return tags -- 2.30.2