Add a 'ignore-previously-merged' config option which gives similar behavior to the...

svn path=/main/branches/2.1.2/; revision=6608

diff --git a/bin/dispatch-conf b/bin/dispatch-conf
index 348274802544d263896066b3fdb8d88520919027..779610996be3a826f4d66549e432b2328b1f4994 100755 (executable)
--- a/bin/dispatch-conf
+++ b/bin/dispatch-conf
@@ -141,6 +141,14 @@ class dispatch:
             else:
                 newconf = conf['new']
 
+            if newconf == mrgconf and \
+                self.options.get('ignore-previously-merged') != 'yes' and \
+                len(commands.getoutput(DIFF_CONTENTS % (conf['current'], mrgconf))) == 0:
+                # The current update is identical to the archived .dist
+                # version that has previously been merged.
+                os.unlink(mrgconf)
+                newconf = conf['new']
+
             mystatus, myoutput = commands.getstatusoutput(
                 DIFF_CONTENTS  % (conf ['current'], newconf))
             same_file = 0 == len(myoutput)

diff --git a/cnf/dispatch-conf.conf b/cnf/dispatch-conf.conf
index b1ece73bb5f1eb13561fa19037c07705a71e5bb8..d4caa95579f47b47086b091ca43ddee378556635 100644 (file)
--- a/cnf/dispatch-conf.conf
+++ b/cnf/dispatch-conf.conf
@@ -32,6 +32,11 @@ replace-wscomments=no
 # (yes or no)
 replace-unmodified=no
 
+# Ignore a version that is identical to the previously merged version,
+# even though it is different from the current user modified version
+# (yes or no)
+ignore-previously-merged=yes
+
 # Per-session log file of changes made to configuration files
 #log-file=/var/log/dispatch-conf.log