From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 131006 invoked by alias); 19 Sep 2016 16:20:00 -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 130976 invoked by uid 9795); 19 Sep 2016 16:20:00 -0000 Date: Mon, 19 Sep 2016 16:20:00 -0000 Message-ID: <20160919162000.130949.qmail@sourceware.org> From: jturney@sourceware.org To: cygwin-apps-cvs@sourceware.org Subject: [calm - Cygwin server-side packaging maintenance script] branch master, updated. 20160705-24-g432c17a X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 58939006d9020bd49503ae6586e5b1f9fafdd87b X-Git-Newrev: 432c17a62e7a5f7e89e64b8149524f9f5237ea5e X-SW-Source: 2016-q3/txt/msg00038.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=432c17a62e7a5f7e89e64b8149524f9f5237ea5e commit 432c17a62e7a5f7e89e64b8149524f9f5237ea5e Author: Jon Turney 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