The warning message when rsync fails back to scp is unnecessary, and
very polluting of the screen and logs when you work with systems without
rsync installed. Just drop the warning

Signed-off-by: Martin J. Bligh <[email protected]>

Index: abstract_ssh.py
===================================================================
--- abstract_ssh.py     (revision 4057)
+++ abstract_ssh.py     (working copy)
@@ -211,9 +211,6 @@
                                          delete_dest, preserve_symlinks)
             utils.run(rsync)
         except error.CmdError, e:
-            logging.warn("warning: rsync failed with: %s", e)
-            logging.info("attempting to copy with scp instead")
-
             # scp has no equivalent to --delete, just drop the entire dest dir
             if delete_dest and os.path.isdir(dest):
                 shutil.rmtree(dest)
@@ -278,9 +275,6 @@
                                          delete_dest, preserve_symlinks)
             utils.run(rsync)
         except error.CmdError, e:
-            logging.warn("Command rsync failed with: %s", e)
-            logging.info("Attempting to copy with scp instead")
-
             # scp has no equivalent to --delete, just drop the entire dest dir
             if delete_dest:
                 is_dir = self.run("ls -d %s/" % dest,
_______________________________________________
Autotest mailing list
[email protected]
http://test.kernel.org/cgi-bin/mailman/listinfo/autotest

Reply via email to