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. 20160705-24-g432c17a Date: Mon, 19 Sep 2016 16:20:00 -0000 [thread overview] Message-ID: <20160919162000.130949.qmail@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=432c17a62e7a5f7e89e64b8149524f9f5237ea5e commit 432c17a62e7a5f7e89e64b8149524f9f5237ea5e Author: Jon Turney <jon.turney@dronecode.org.uk> Date: Mon Sep 19 17:15:38 2016 +0100 Ignore comment lines when checking if setup.ini has changed Needed now that the comment contains a human-readable timestamp Diff: --- calm/calm.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/calm/calm.py b/calm/calm.py index 4d5e371..a9a5ed5 100755 --- a/calm/calm.py +++ b/calm/calm.py @@ -342,8 +342,8 @@ def do_main(args): logging.warning('no existing %s' % (inifile)) changed = True else: - # or, if it's changed in more than timestamp - status = os.system('/usr/bin/diff -I^setup-timestamp -w -B -q %s %s >/dev/null' % (inifile, tmpfile.name)) + # or, if it's changed in more than timestamp and comments + status = os.system('/usr/bin/diff -I^setup-timestamp -I^# -w -B -q %s %s >/dev/null' % (inifile, tmpfile.name)) logging.debug('diff exit status %d' % (status)) if (status >> 8) == 1: changed = True
reply other threads:[~2016-09-19 16:20 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=20160919162000.130949.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).