Roll 50: Updated for push to origin/master.

tools/utils.py

 # Copyright (c) 2012, 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.
 
 # This file contains a set of utilities functions used by other Python-based
 # scripts.
 
 import commands
 import contextlib
 import datetime
@@ skipping 386 matching lines @@
 # and the commit. This was true across branches as well, so a number used
 # to archive a build was always unique and unambiguous.
 # In git there is no such global number, so we loosen the requirement a bit.
 # We only use numbers on the master branch (bleeding edge). On branches
 # we use the version number instead for archiving purposes.
 # The number on master is the count of commits on the master branch.
 def GetArchiveVersion():
   version = ReadVersionFile()
   if not version:
     raise 'Could not get the archive version, parsing the version file failed'
-  if version.channel == 'be':
+  if version.channel in ['be', 'integration']:
     return GetGitNumber()
   return GetSemanticSDKVersion()
 
 
 def GetGitRevision():
   # When building from tarball use tools/GIT_REVISION
   git_revision_file = os.path.join(DART_DIR, 'tools', 'GIT_REVISION')
   try:
     with open(git_revision_file) as fd:
       return fd.read()
@@ skipping 625 matching lines @@
     return contextlib.nested(WindowsCoreDumpEnabler(),
                              WindowsCoreDumpArchiver())
   else:
     # We don't have support for MacOS yet.
     assert osname == 'macos'
     return NooptCoreDumpArchiver()
 
 if __name__ == "__main__":
   import sys
   Main()