From b90f2b69c84722060bce7735de99e5e332a16d69 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Wed, 23 May 2007 17:37:34 +0000 Subject: [PATCH] I should run tabnanny myself before committing too... :/ svn path=/main/branches/prefix/; revision=6600 --- bin/dispatch-conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/dispatch-conf b/bin/dispatch-conf index 3fe8cb2ee..5507b5663 100755 --- a/bin/dispatch-conf +++ b/bin/dispatch-conf @@ -140,9 +140,9 @@ 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: + 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) -- 2.26.2