[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20160705-24-g432c17a

[jturney at sourceware dot org]

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