Merge from aj

diff --git a/dak/transitions.py b/dak/transitions.py
index d1d62cdf67ef773db6ccd471ef8e57a27bd52f6c..3cac07af25142477214ff8d9c9db159f4455be3d 100755 (executable)
--- a/dak/transitions.py
+++ b/dak/transitions.py
@@ -192,11 +192,11 @@ def edit_transitions():
 
         if test == None:
             # Edit is broken
-           print "Edit was unparsable."
+            print "Edit was unparsable."
             prompt = "[E]dit again, Drop changes?"
-           default = "E"
-       else:
-           print "Edit looks okay.\n"
+            default = "E"
+        else:
+            print "Edit looks okay.\n"
             print "------------------------------------------------------------------------"
             transition_info(test)
 
@@ -219,9 +219,9 @@ def edit_transitions():
         elif answer == 'S':
             # Ready to save
             break
-       else:
-           print "You pressed something you shouldn't have :("
-           sys.exit(1)
+        else:
+            print "You pressed something you shouldn't have :("
+            sys.exit(1)
 
     # We seem to be done and also have a working file. Copy over.
     write_transitions_from_file(edit_file)