I should run tabnanny myself before committing too... :/

svn path=/main/branches/prefix/; revision=6600

diff --git a/bin/dispatch-conf b/bin/dispatch-conf
index 3fe8cb2ee0d23b62902f235489ae93e33c78642d..5507b5663d14e9b5f95d702bec6d4735f9b7179a 100755 (executable)
--- 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)