chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bc5bf7e
)
build: clear timeout flag before every build
author
Marcus Hoffmann
<bubu@bubu1.eu>
Wed, 7 Feb 2018 19:46:29 +0000
(20:46 +0100)
committer
Marcus Hoffmann
<bubu@bubu1.eu>
Wed, 7 Feb 2018 19:47:50 +0000
(20:47 +0100)
This fixes the weird logging behaviour where after a build that timed
out all subsequent failed builds would also show up as timed out.
fdroidserver/build.py
patch
|
blob
|
history
diff --git
a/fdroidserver/build.py
b/fdroidserver/build.py
index 0b575847199b8db928b1fcdcbe534f34d1693f88..4ece75d8e9564a2fa3fbb5076f712b479d484ea0 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