[polymer] Merge of master into polymer10-migration

telemetry/telemetry/core/cros_interface.py

 # Copyright 2013 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.
 """A wrapper around ssh for common operations on a CrOS-based device"""
 import logging
 import os
 import re
 import shutil
 import stat
 import subprocess
@@ skipping 288 matching lines @@
     Args:
       filename: The name of the local source file.
       destfile: The name of the file to copy to, and if it is not specified
         then it is the basename of the source file.
 
     """
     logging.debug("GetFile(%s, %s)" % (filename, destfile))
     if self.local:
       if destfile is not None and destfile != filename:
         shutil.copyfile(filename, destfile)
-      return
+        return
+      else:
+        raise OSError('No such file or directory %s' % filename)
 
     if destfile is None:
       destfile = os.path.basename(filename)
     args = self._FormSCPFromRemote(filename, os.path.abspath(destfile))
 
     stdout, stderr = GetAllCmdOutput(args, quiet=True)
     stderr = self._RemoveSSHWarnings(stderr)
     if stderr != '':
       raise OSError('No such file or directory %s' % stderr)
 
@@ skipping 211 matching lines @@
     else:
       self.RunCmdOnDevice(['start', 'ui'])
 
   def CloseConnection(self):
     if not self.local:
       with open(os.devnull, 'w') as devnull:
         subprocess.call(
             self.FormSSHCommandLine(['-O', 'exit', self._hostname]),
             stdout=devnull,
             stderr=devnull)