Don't run the old annotated step script on our dart-editor-fyi-* builders

client/tools/buildbot_annotated_steps.py

 #!/usr/bin/python
 # Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Dart client buildbot steps
@@ skipping 185 matching lines @@
 
 
   #TODO(sigmund): remove this indirection once we update our bots
   (name, version) = GetBuildInfo()
   # The buildbot will set a BUILDBOT_JAVA_HOME relative to the dart
   # root directory, set JAVA_HOME based on that.
   FixJavaHome()
   if name.startswith('dart-editor'):
     # TODO(kustermann,ricow): This is a temporary hack until we can safely
     # enable it on main waterfall. We need to remove this eventually
-    is_fyi = False
     if name.startswith('dart-editor-fyi'):
       match = re.search('dart-editor-fyi(.*)', name)
       name = 'dart-editor' + match.group(1)
-      is_fyi = True
-    # Run the old annotated steps script first.
-    status = ProcessTools('release', name, version)
-    # In case we're an FYI builder, run 'tools/bots/editor.py' as well
-    if is_fyi:
-      status = ProcessBot(name, 'editor') or status
+      # In case we're an FYI builder, run 'tools/bots/editor.py'.
+      status = ProcessBot(name, 'editor')
+    else:
+      # Run the old annotated steps script
+      status = ProcessTools('release', name, version)
   elif name.startswith('pub-'):
     status = ProcessBot(name, 'pub')
   elif name.startswith('vm-android'):
     status = ProcessBot(name, 'android')
   else:
     status = ProcessBot(name, 'compiler')
 
   if status:
     print '@@@STEP_FAILURE@@@'
 
   return status
 
 
 if __name__ == '__main__':
   sys.exit(main())