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

Refuse to try downloading a repo twice

Browse source
This commit is contained in:
Daniel Martí 2014-07-02 17:21:45 +02:00
parent d132adf63c
commit 5aad7b5d38
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
fdroidserver/common.py
View file

@ -339,6 +339,7 @@ class vcs:
self.remote = remote self.remote = remote
self.local = local self.local = local
self.clone_failed = False
self.refreshed = False self.refreshed = False
self.srclib = None self.srclib = None
@ -354,6 +355,9 @@ class vcs:
# the repo - otherwise it must specify a valid revision. # the repo - otherwise it must specify a valid revision.
def gotorevision(self, rev): def gotorevision(self, rev):
if self.clone_failed:
raise VCSException("Downloading the repository already failed once, not trying again.")
# The .fdroidvcs-id file for a repo tells us what VCS type # The .fdroidvcs-id file for a repo tells us what VCS type
# and remote that directory was created from, allowing us to drop it # and remote that directory was created from, allowing us to drop it
# automatically if either of those things changes. # automatically if either of those things changes.
@ -433,6 +437,7 @@ class vcs_git(vcs):
# Brand new checkout # Brand new checkout
p = FDroidPopen(['git', 'clone', self.remote, self.local]) p = FDroidPopen(['git', 'clone', self.remote, self.local])
if p.returncode != 0: if p.returncode != 0:
self.clone_failed = True
raise VCSException("Git clone failed", p.output) raise VCSException("Git clone failed", p.output)
self.checkrepo() self.checkrepo()
else: else:
@ -550,10 +555,12 @@ class vcs_gitsvn(vcs):
gitsvn_cmd += ' -b %s' % i[9:] gitsvn_cmd += ' -b %s' % i[9:]
p = SilentPopen([gitsvn_cmd + " %s %s" % (remote_split[0], self.local)], shell=True) p = SilentPopen([gitsvn_cmd + " %s %s" % (remote_split[0], self.local)], shell=True)
if p.returncode != 0: if p.returncode != 0:
self.clone_failed = True
raise VCSException("Git clone failed", p.output) raise VCSException("Git clone failed", p.output)
else: else:
p = SilentPopen([gitsvn_cmd + " %s %s" % (self.remote, self.local)], shell=True) p = SilentPopen([gitsvn_cmd + " %s %s" % (self.remote, self.local)], shell=True)
if p.returncode != 0: if p.returncode != 0:
self.clone_failed = True
raise VCSException("Git clone failed", p.output) raise VCSException("Git clone failed", p.output)
self.checkrepo() self.checkrepo()
else: else:
@ -643,6 +650,7 @@ class vcs_svn(vcs):
if not os.path.exists(self.local): if not os.path.exists(self.local):
p = SilentPopen(['svn', 'checkout', self.remote, self.local] + self.userargs()) p = SilentPopen(['svn', 'checkout', self.remote, self.local] + self.userargs())
if p.returncode != 0: if p.returncode != 0:
self.clone_failed = True
raise VCSException("Svn checkout of '%s' failed" % rev, p.output) raise VCSException("Svn checkout of '%s' failed" % rev, p.output)
else: else:
for svncommand in ( for svncommand in (
@ -679,6 +687,7 @@ class vcs_hg(vcs):
if not os.path.exists(self.local): if not os.path.exists(self.local):
p = SilentPopen(['hg', 'clone', self.remote, self.local]) p = SilentPopen(['hg', 'clone', self.remote, self.local])
if p.returncode != 0: if p.returncode != 0:
self.clone_failed = True
raise VCSException("Hg clone failed", p.output) raise VCSException("Hg clone failed", p.output)
else: else:
p = SilentPopen(['hg status -uS | xargs rm -rf'], cwd=self.local, shell=True) p = SilentPopen(['hg status -uS | xargs rm -rf'], cwd=self.local, shell=True)
@ -721,6 +730,7 @@ class vcs_bzr(vcs):
if not os.path.exists(self.local): if not os.path.exists(self.local):
p = SilentPopen(['bzr', 'branch', self.remote, self.local]) p = SilentPopen(['bzr', 'branch', self.remote, self.local])
if p.returncode != 0: if p.returncode != 0:
self.clone_failed = True
raise VCSException("Bzr branch failed", p.output) raise VCSException("Bzr branch failed", p.output)
else: else:
p = SilentPopen(['bzr', 'clean-tree', '--force', '--unknown', '--ignored'], cwd=self.local) p = SilentPopen(['bzr', 'clean-tree', '--force', '--unknown', '--ignored'], cwd=self.local)