diff options
Diffstat (limited to 'bin/dispatch-conf')
| -rwxr-xr-x | bin/dispatch-conf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/dispatch-conf b/bin/dispatch-conf index 779610996..6e7ab71f6 100755 --- a/bin/dispatch-conf +++ b/bin/dispatch-conf @@ -143,7 +143,8 @@ class dispatch: if newconf == mrgconf and \ self.options.get('ignore-previously-merged') != 'yes' and \ - len(commands.getoutput(DIFF_CONTENTS % (conf['current'], mrgconf))) == 0: + os.path.exists(archive+'.dist') and \ + len(commands.getoutput(DIFF_CONTENTS % (archive+'.dist', conf['new']))) == 0: # The current update is identical to the archived .dist # version that has previously been merged. os.unlink(mrgconf) |