summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/core/target/ssh.py
diff options
context:
space:
mode:
Diffstat (limited to 'meta/lib/oeqa/core/target/ssh.py')
-rw-r--r--meta/lib/oeqa/core/target/ssh.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/lib/oeqa/core/target/ssh.py b/meta/lib/oeqa/core/target/ssh.py
index 090b40a814..aefb576805 100644
--- a/meta/lib/oeqa/core/target/ssh.py
+++ b/meta/lib/oeqa/core/target/ssh.py
@@ -107,13 +107,16 @@ class OESSHTarget(OETarget):
107 scpCmd = self.scp + [localSrc, remotePath] 107 scpCmd = self.scp + [localSrc, remotePath]
108 return self._run(scpCmd, ignore_status=False) 108 return self._run(scpCmd, ignore_status=False)
109 109
110 def copyFrom(self, remoteSrc, localDst): 110 def copyFrom(self, remoteSrc, localDst, warn_on_failure=False):
111 """ 111 """
112 Copy file from target. 112 Copy file from target.
113 """ 113 """
114 remotePath = '%s@%s:%s' % (self.user, self.ip, remoteSrc) 114 remotePath = '%s@%s:%s' % (self.user, self.ip, remoteSrc)
115 scpCmd = self.scp + [remotePath, localDst] 115 scpCmd = self.scp + [remotePath, localDst]
116 return self._run(scpCmd, ignore_status=False) 116 (status, output) = self._run(scpCmd, ignore_status=warn_on_failure)
117 if warn_on_failure and status:
118 self.logger.warning("Copy returned non-zero exit status %d:\n%s" % (status, output))
119 return (status, output)
117 120
118 def copyDirTo(self, localSrc, remoteDst): 121 def copyDirTo(self, localSrc, remoteDst):
119 """ 122 """