kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-19 21:30:10 +01:00
Code Activity

Merge branch 'git_prune' into 'master'

Browse Source 
git prune branches in case of failure

See merge request fdroid/fdroidserver!1026
This commit is contained in:
Jochen Sprickerhof 2021-10-14 12:42:38 +00:00
commit e036f31613
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fdroidserver/common.py
View File

@ -1167,6 +1167,9 @@ class vcs_git(vcs):
p = self.git(['fetch', 'origin'], cwd=self.local) p = self.git(['fetch', 'origin'], cwd=self.local)
if p.returncode != 0: if p.returncode != 0:
raise VCSException(_("Git fetch failed"), p.output) raise VCSException(_("Git fetch failed"), p.output)
p = self.git(['remote', 'prune', 'origin'], output=False, cwd=self.local)
if p.returncode != 0:
raise VCSException(_("Git prune failed"), p.output)
p = self.git(['fetch', '--prune', '--tags', '--force', 'origin'], output=False, cwd=self.local) p = self.git(['fetch', '--prune', '--tags', '--force', 'origin'], output=False, cwd=self.local)
if p.returncode != 0: if p.returncode != 0:
raise VCSException(_("Git fetch failed"), p.output) raise VCSException(_("Git fetch failed"), p.output)