Fix merge problems in r38573, a cleanup of build scripts.

tools/bots/linux_distribution_support.py

 #!/usr/bin/python
 
 # Copyright (c) 2014, 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.
 
 """
 Buildbot steps for src tarball generation and debian package generation
 
 Package up the src of the dart repo and create a debian package.
@@ skipping 81 matching lines @@
         print 'Assumed installed, but could not find %s' % path
         sys.exit(1)
 
 def SrcSteps(build_info):
   # We always clobber the bot, to not leave old tarballs and packages
   # floating around the out dir.
   bot.Clobber(force=True)
 
   version = utils.GetVersion()
   builddir = os.path.join(bot_utils.DART_DIR,
-                          utils.GetBuildDir(HOST_OS, HOST_OS),
+                          utils.GetBuildDir(HOST_OS),
                           'src_and_installation')
 
   if not os.path.exists(builddir):
     os.makedirs(builddir)
   tarfilename = 'dart-%s.tar.gz' % version
   tarfile = os.path.join(builddir, tarfilename)
 
   with bot.BuildStep('Validating linux system'):
     print 'Validating that we are on %s' % build_info.builder_tag
     args = ['cat', '/etc/os-release']
@@ skipping 62 matching lines @@
     bot_name, _ = bot.GetBotName()
     channel = bot_utils.GetChannelFromName(bot_name)
     if channel != bot_utils.Channel.BLEEDING_EDGE:
      ArchiveArtifacts(tarfile, builddir, channel, build_info.builder_tag)
     else:
       print 'Not uploading artifacts on bleeding edge'
 
 if __name__ == '__main__':
   # We pass in None for build_step to avoid building the sdk.
   bot.RunBot(SrcConfig, SrcSteps, build_step=None)