public inbox for cygwin-apps-cvs@sourceware.org help / color / mirror / Atom feed
From: jturney@sourceware.org To: cygwin-apps-cvs@sourceware.org Subject: [calm - Cygwin server-side packaging maintenance script] branch master, updated. 20181020-8-gd7cbb40 Date: Fri, 29 Mar 2019 19:10:00 -0000 [thread overview] Message-ID: <20190329191039.37826.qmail@sourceware.org> (raw) 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')
reply other threads:[~2019-03-29 19:10 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190329191039.37826.qmail@sourceware.org \ --to=jturney@sourceware.org \ --cc=cygwin-apps-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).