From: Fabian Groffen <grobian@gentoo.org>
Date: Wed, 23 May 2007 17:37:34 +0000 (-0000)
Subject: I should run tabnanny myself before committing too... :/
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=b90f2b69c84722060bce7735de99e5e332a16d69;p=portage.git

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 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)