Fix issues in assets scripts

infra/bots/assets/asset_utils.py

 #!/usr/bin/env python
 #
 # Copyright 2016 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 """Utilities for managing assets."""
 
@@ skipping 180 matching lines @@
     with utils.tmp_dir():
       zip_file = os.path.join(os.getcwd(), '%d.zip' % version)
       self.copy(gs_path, zip_file)
       zip_utils.unzip(zip_file, target_dir)
 
   def delete_contents(self, name):
     """Delete data for the given asset."""
     gs_path = GS_SUBDIR_TMPL % (self._gs_bucket, name)
     attempt_delete = True
     try:
-      subprocess.check_call(['gsutil', 'ls', gs_path])
+      subprocess.check_call(self._gsutil + ['ls', gs_path])
     except subprocess.CalledProcessError:
       attempt_delete = False
     if attempt_delete:
-      subprocess.check_call(['gsutil', 'rm', '-rf', gs_path])
+      subprocess.check_call(self._gsutil + ['rm', '-rf', gs_path])
 
 
 class MultiStore(object):
   """Wrapper object which uses CIPD as the primary store and GS for backup."""
   def __init__(self, cipd_url=DEFAULT_CIPD_SERVICE_URL,
                gsutil=None, gs_bucket=DEFAULT_GS_BUCKET):
     self._cipd = CIPDStore(cipd_url=cipd_url)
     self._gs = GSStore(gsutil=gsutil, bucket=gs_bucket)
 
   def get_available_versions(self, name):
@@ skipping 107 matching lines @@
       raise Exception('Asset %s does not exist!' % self._name)
 
     # Cleanup the store.
     if remove_in_store:
       self._store.delete_contents(self._name)
 
     # Remove the asset.
     subprocess.check_call([utils.GIT, 'rm', '-rf', self._dir])
     if os.path.isdir(self._dir):
       shutil.rmtree(self._dir)