From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 38088 invoked by alias); 29 Mar 2019 19:10:39 -0000 Mailing-List: contact cygwin-apps-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cygwin-apps-cvs-owner@sourceware.org Received: (qmail 37850 invoked by uid 9795); 29 Mar 2019 19:10:39 -0000 Date: Fri, 29 Mar 2019 19:10:00 -0000 Message-ID: <20190329191039.37826.qmail@sourceware.org> From: jturney@sourceware.org To: cygwin-apps-cvs@sourceware.org Subject: [calm - Cygwin server-side packaging maintenance script] branch master, updated. 20181020-8-gd7cbb40 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: f119196ce2b61a1cedec15dba83d49b022bfe639 X-Git-Newrev: d7cbb403c6b7b48b0b161ee4372aeb47abacf485 X-SW-Source: 2019-q1/txt/msg00007.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=d7cbb403c6b7b48b0b161ee4372aeb47abacf485 commit d7cbb403c6b7b48b0b161ee4372aeb47abacf485 Author: Jon Turney 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 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')