catdog2/pelican-deployment-system
1
0
Fork 0
mirror of https://github.com/IEEE-SB-Passau/pelican-deployment-system.git synced 2017-09-06 16:35:38 +02:00
Code Activity

things

Browse Source
This commit is contained in:
Peter Dahlberg
2016-06-13 16:05:22 +02:00
parent 9b2808d836
commit ab13e51237
4 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pelican_deploy/deploy.py
View File

@@ -85,7 +85,7 @@ class DeploymentRunner:
# deinit submodules to avoid removed ones dangling around later
# they should stay around in .git, so reinit should be fast
result = repo.submodule("deinit", ".")
result = repo.submodule("deinit", "--force", ".")
log_git(result)
result = repo.checkout("--force", self.git_branch)
@@ -111,7 +111,7 @@ class DeploymentRunner:
result = repo.submodule("update", "--init", "--force", "--recursive")
log_git(result)
def build(self, abort_running=False):
def build(self, abort_running=False, wait=False):
with self._build_lock:
if abort_running:
self.try_abort_build()
@@ -123,7 +123,10 @@ class DeploymentRunner:
self._futures.remove(fut)
build_func = exception_logged(self.build_blocking, log.error)
self._futures.add(self._executor.submit(build_func))
future = self._executor.submit(build_func)
self._futures.add(future)
if wait:
return future.result()
def try_abort_build(self):
proc = self._build_proc