diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/lib/oeqa/utils/sshcontrol.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/meta/lib/oeqa/utils/sshcontrol.py b/meta/lib/oeqa/utils/sshcontrol.py index 05d6502550..d292893c08 100644 --- a/meta/lib/oeqa/utils/sshcontrol.py +++ b/meta/lib/oeqa/utils/sshcontrol.py | |||
| @@ -150,12 +150,9 @@ class SSHControl(object): | |||
| 150 | 150 | ||
| 151 | def copy_to(self, localpath, remotepath): | 151 | def copy_to(self, localpath, remotepath): |
| 152 | if os.path.islink(localpath): | 152 | if os.path.islink(localpath): |
| 153 | link = os.readlink(localpath) | 153 | localpath = os.path.dirname(localpath) + "/" + os.readlink(localpath) |
| 154 | dst_dir, dst_base = os.path.split(remotepath) | 154 | command = self.scp + [localpath, '%s@%s:%s' % (self.user, self.ip, remotepath)] |
| 155 | return self.run("cd %s; ln -s %s %s" % (dst_dir, link, dst_base)) | 155 | return self._internal_run(command, ignore_status=False) |
| 156 | else: | ||
| 157 | command = self.scp + [localpath, '%s@%s:%s' % (self.user, self.ip, remotepath)] | ||
| 158 | return self._internal_run(command, ignore_status=False) | ||
| 159 | 156 | ||
| 160 | def copy_from(self, remotepath, localpath): | 157 | def copy_from(self, remotepath, localpath): |
| 161 | command = self.scp + ['%s@%s:%s' % (self.user, self.ip, remotepath), localpath] | 158 | command = self.scp + ['%s@%s:%s' % (self.user, self.ip, remotepath), localpath] |
