Revert 250524 "gclient: Use the correct bot hostnames to enable ..."

trunk/tools/depot_tools/gclient.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Meta checkout manager supporting both Subversion and GIT."""
 # Files
 #   .gclient      : Current client configuration, written by 'config' command.
 #                   Format is a Python script defining 'solutions', a list whose
 #                   entries each are maps binding the strings "name" and "url"
@@ skipping 662 matching lines @@
         def enable_deletion_of_conflicting_checkouts():
           """Determines whether to enable new checkout deletion behavior.
 
           Initially, enables the experimental functionality on a small set of
           bots.
           """
           # TODO(borenet): Remove this hack as soon as we've verified that it
           # doesn't cause the bots to break.
           if not os.environ.get('CHROME_HEADLESS'):
             return False
-          return socket.gethostname() in ('vm859-m1', 'BUILD1-M1',
-                                          'vm630-m1.golo.chromium.org')
+          hostname = socket.gethostname()
+          logging.warning('Hostname of this machine: %s' % hostname)
+          return hostname in ('vm859-m1', 'build1-m1', 'vm630-m1')
 
         # When updating, determine whether the destination directory contains a
         # checkout of the desired repository. If not, avoid conflicts by
         # deleting the directory before running the update.
         if command == 'update' and enable_deletion_of_conflicting_checkouts():
           logging.warning('Experimental deletion of mismatching checkouts '
                           'enabled.')
           actual_remote_url = self._used_scm.GetRemoteURL(options)
           url, _ = gclient_utils.SplitUrlRevision(parsed_url)
           url = url.rstrip('/')
@@ skipping 1261 matching lines @@
     raise
   except (gclient_utils.Error, subprocess2.CalledProcessError), e:
     print >> sys.stderr, 'Error: %s' % str(e)
     return 1
 
 
 if '__main__' == __name__:
   sys.exit(Main(sys.argv[1:]))
 
 # vim: ts=2:sw=2:tw=80:et: