From: reagle <joseph.2008@reagle.org>
Date: Wed, 2 Feb 2011 22:19:15 +0000 (-0500)
Subject: Merge remote branch 'upstream/master'
X-Git-Url: https://projects.mako.cc/source/mw/commitdiff_plain/993ca0c147e9801768f7e5aa3f21c8f22fe0e897?hp=9ef27bc8f58e620ef72264de998a0035321155f0

Merge remote branch 'upstream/master'

Conflicts:
	src/mw/clicommands.py
---

diff --git a/src/mw/clicommands.py b/src/mw/clicommands.py
index 2681c43..dcc5682 100644
--- a/src/mw/clicommands.py
+++ b/src/mw/clicommands.py
@@ -319,11 +319,11 @@ class CommitCommand(CommandBase):
                 if self.options.bot:
                     data['bot'] = 'bot'
                 response = self.api.call(data)
-                 if 'error' in response:
-                     if 'code' in response['error']:
-                         if response['error']['code'] == 'permissiondenied':
-                             print 'Permission denied -- try running "mw login"'
-                             return
+                if 'error' in response:
+                    if 'code' in response['error']:
+                        if response['error']['code'] == 'permissiondenied':
+                            print 'Permission denied -- try running "mw login"'
+                            return
                 if response['edit']['result'] == 'Success':
                     if 'nochange' in response['edit']:
                         print 'warning: no changes detected in %s - ' \