chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'build-36h' into 'master'
[fdroidserver.git]
/
fdroidserver
/
build.py
diff --git
a/fdroidserver/build.py
b/fdroidserver/build.py
index 31fcdbb12fefc3765effa6d7827f399f11a252a1..41fb2251399dcf304e2676b7c8cf6d551c4a8550 100644
(file)
--- a/
fdroidserver/build.py
+++ b/
fdroidserver/build.py
@@
-1102,6
+1102,7
@@
def main():
if options.server and timeout > 0:
logging.debug(_('Setting {0} sec timeout for this build').format(timeout))
timer = threading.Timer(timeout, force_halt_build, [timeout])
+ timeout_event.clear()
timer.start()
else:
timer = None