Revert of [Android] Add a configurable environment for devil/. (RELAND 2)

tools/telemetry/catapult_base/dependency_manager/cloud_storage_info.py

 # Copyright 2015 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.
 
-import errno
 import logging
 import os
 import stat
 
 from catapult_base import cloud_storage
 
 from catapult_base.dependency_manager import exceptions
 
 class CloudStorageInfo(object):
   def __init__(self, cs_bucket, cs_hash, download_path, cs_remote_path,
@@ skipping 41 matching lines @@
             needed file.
         CloudStorageError: If another error occured while downloading the remote
             path.
         FileNotFoundError: If the download was otherwise unsuccessful.
     """
     if not self._has_minimum_data:
       return None
 
     download_dir = os.path.dirname(self._download_path)
     if not os.path.exists(download_dir):
-      try:
-        os.makedirs(download_dir)
-      except OSError as e:
-        # The logic above is racy, and os.makedirs will raise an OSError if
-        # the directory exists.
-        if e.errno != errno.EEXIST:
-          raise
+      os.makedirs(download_dir)
 
     dependency_path = self._download_path
     cloud_storage.GetIfHashChanged(
         self._cs_remote_path, self._download_path, self._cs_bucket,
         self._cs_hash)
     if not os.path.exists(dependency_path):
       raise exceptions.FileNotFoundError(dependency_path)
 
     logging.error('has archive_info %s', self._archive_info)
     if self.has_archive_info:
@@ skipping 16 matching lines @@
   @property
   def has_archive_info(self):
     return bool(self._archive_info)
 
   def __repr__(self):
     return (
         'CloudStorageInfo(download_path=%s, cs_remote_path=%s, cs_bucket=%s, '
         'cs_hash=%s, version_in_cs=%s, archive_info=%s)' % (
             self._download_path, self._cs_remote_path, self._cs_bucket,
             self._cs_hash, self._version_in_cs, self._archive_info))