diff options
author | Jon Turney <jon.turney@dronecode.org.uk> | 2017-10-25 14:37:25 +0300 |
---|---|---|
committer | Jon Turney <jon.turney@dronecode.org.uk> | 2017-10-25 17:26:49 +0300 |
commit | 50b62e935a650c63a34c2bc35d725a15f35dd566 (patch) | |
tree | 71caed6d9845a7c44693e574761c911bb7042ef3 | |
parent | 6b03c67d3a59a9f6687b734729d3c4fd7465bb97 (diff) |
Don't ignore scan-relarea if it arrives during scan-uploads
-rwxr-xr-x | calm/calm.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/calm/calm.py b/calm/calm.py index 14d4317..729dec8 100755 --- a/calm/calm.py +++ b/calm/calm.py @@ -513,10 +513,15 @@ def do_daemon(args, state): do_output(args, state) - # if there is more work to do, but don't spin if we can't do it + # if there is more work to do, but don't spin if we + # can't do anything because relarea is bad if read_uploads: continue + # if there is more work to do + if read_relarea: + continue + # we wake at a 10 minute offset from the next 240 minute boundary # (i.e. at :10 past every fourth hour) to check the state of the # release area, in case someone has ninja-ed in a change there... |