Bot_update - Branch detection fix

scripts/slave/bot_update.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 # TODO(hinoka): Use logging.
 
 import cStringIO
 import codecs
 import collections
@@ skipping 469 matching lines @@
 
 def maybe_ignore_revision(revision, buildspec):
   """Handle builders that don't care what buildbot tells them to build.
 
   This is especially the case with branch builders that build from buildspecs
   and/or trigger off multiple repositories, where the --revision passed in has
   nothing to do with the solution being built. Clearing the revision in this
   case causes bot_update to use HEAD rather that trying to checkout an
   inappropriate version of the solution.
   """
-  if buildspec and buildspec.container == 'branch':
+  if buildspec and buildspec.container == 'branches':
     return []
   return revision
 
 
 def solutions_printer(solutions):
   """Prints gclient solution to stdout."""
   print 'Gclient Solutions'
   print '================='
   for solution in solutions:
     name = solution.get('name')
@@ skipping 1137 matching lines @@
   except Exception:
     # Unexpected failure.
     emit_flag(options.flag_file)
     raise
   else:
     emit_flag(options.flag_file)
 
 
 if __name__ == '__main__':
   sys.exit(main())