diff options
Diffstat (limited to 'bin/dispatch-conf')
| -rwxr-xr-x | bin/dispatch-conf | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/bin/dispatch-conf b/bin/dispatch-conf index a62a0ef40..816de0de3 100755 --- 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) |