Merge remote branch 'cros/upstream' into tempbranch

server/hosts/abstract_ssh.py

 import os, time, types, socket, shutil, glob, logging, traceback
 from autotest_lib.client.common_lib import autotemp, error, logging_manager
 from autotest_lib.server import utils, autotest
 from autotest_lib.server.hosts import remote
 from autotest_lib.client.common_lib.global_config import global_config
 
 
 get_value = global_config.get_config_value
 enable_master_ssh = get_value('AUTOSERV', 'enable_master_ssh', type=bool,
                               default=False)
@@ skipping 51 matching lines @@
     def use_rsync(self):
         if self._use_rsync is not None:
             return self._use_rsync
 
         # Check if rsync is available on the remote host. If it's not,
         # don't try to use it for any future file transfers.
         self._use_rsync = self._check_rsync()
         if not self._use_rsync:
             logging.warn("rsync not available on remote host %s -- disabled",
                          self.hostname)
+        return self._use_rsync

[truty, 2010/11/15 19:32:09]

This may be interesting to us.

 
 
     def _check_rsync(self):
         """
         Check if rsync is available on the remote host.
         """
         try:
             self.run("rsync --version", stdout_tee=None, stderr_tee=None)
         except error.AutoservRunError:
             return False
@@ skipping 500 matching lines @@
 
         This is useful if the test SSHes to the machine, then reinstalls it,
         then SSHes to it again.  It can be called after the reinstall to
         reduce the spam in the logs.
         """
         logging.info("Clearing known hosts for host '%s', file '%s'.",
                      self.hostname, self.known_hosts_fd)
         # Clear out the file by opening it for writing and then closing.
         fh = open(self.known_hosts_fd, "w")
         fh.close()