[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20181020-8-gd7cbb40

[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20181020-8-gd7cbb40

[jturney]

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=d7cbb403c6b7b48b0b161ee4372aeb47abacf485

commit d7cbb403c6b7b48b0b161ee4372aeb47abacf485
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Fri Mar 29 18:34:11 2019 +0000

    Tolerate an empty override.hint
    
    Unlike pvr.hint, it can be valid if it doesn't contain anything

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=c57125f8ab921d41028a78c150211c1c49765088

commit c57125f8ab921d41028a78c150211c1c49765088
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Fri Mar 29 18:24:12 2019 +0000

    Fix a bit of spammy IRC reporting


Diff:
---
 calm/calm.py    |    3 ++-
 calm/package.py |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/calm/calm.py b/calm/calm.py
index b5eeaca..36a865f 100755
--- a/calm/calm.py
+++ b/calm/calm.py
@@ -530,7 +530,8 @@ def do_daemon(args, state):
                         logging.error("not processing uploads or writing setup.ini")
                     else:
                         if read_uploads:
-                            irk.irk("calm processing uploads")
+                            if last_signal != signal.SIGALRM:
+                                irk.irk("calm processing uploads")
                             # read uploads on SIGUSR1
                             read_uploads = False
                             state.packages = process_uploads(args, state)
diff --git a/calm/package.py b/calm/package.py
index 5e43f24..c90d955 100755
--- a/calm/package.py
+++ b/calm/package.py
@@ -198,7 +198,7 @@ def read_package(packages, basedir, dirpath, files, remove=[], upload=False):
         if 'override.hint' in files:
             # read override.hint
             override_hints = read_hints(p, os.path.join(dirpath, 'override.hint'), hint.override)
-            if not override_hints:
+            if override_hints is None:
                 logging.error("error parsing %s" % (os.path.join(dirpath, 'override.hint')))
                 return True
             files.remove('override.hint')