Merge remote branch 'origin/upstream' into tempbranch

client/bin/harness_autoserv.py

 import os, logging, ConfigParser
 from autotest_lib.client.common_lib import autotemp, base_packages, error
 from autotest_lib.client.common_lib import global_config
 from autotest_lib.client.bin import harness
 
 
 class harness_autoserv(harness.harness):
     """
     The server harness for running from autoserv
 
@@ skipping 81 matching lines @@
         self._send_and_wait('AUTOTEST_FETCH_PACKAGE', pkg_name, dest_path)
 
 
 class AutoservFetcher(base_packages.RepositoryFetcher):
     def __init__(self, package_manager, job_harness):
         self.url = "autoserv://"
         self.job_harness = job_harness
 
 
     def fetch_pkg_file(self, filename, dest_path):
+        if os.path.exists(dest_path):
+            os.remove(dest_path)
         logging.info('Fetching %s from autoserv to %s', filename, dest_path)
         self.job_harness.fetch_package(filename, dest_path)
         if os.path.exists(dest_path):
             logging.debug('Successfully fetched %s from autoserv', filename)
         else:
             raise error.PackageFetchError('%s not fetched from autoserv'
                                           % filename)