[gnome-continuous-yocto/gnomeostree-3.28-rocko: 8172/8267] sshcontrol.py: in copy_to() always use scp

[Emmanuele Bassi <ebassi src gnome org>]

commit aa6e825bf03621a4a5a882904e94be17153a2707
Author: Erik Botö <erik boto pelagicore com>
Date:   Mon Nov 6 10:13:06 2017 -0800

    sshcontrol.py: in copy_to() always use scp
    
    The current implementation is broken when the localpath is a link.
    Then only a symlink would be created on the target, instead of copying
    the actual file.
    
    [YOCTO #11524]
    
    (From OE-Core rev: a9d446d9c42a67109ae87a156ae43dcbb0f56e1e)
    
    Signed-off-by: Erik Botö <erik boto pelagicore com>
    Signed-off-by: Stephano Cetola <stephano cetola linux intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Armin Kuster <akuster mvista com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 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 05d6502..d292893 100644
--- a/meta/lib/oeqa/utils/sshcontrol.py
+++ b/meta/lib/oeqa/utils/sshcontrol.py
@@ -150,12 +150,9 @@ class SSHControl(object):
 
     def copy_to(self, localpath, remotepath):
         if os.path.islink(localpath):
-            link = os.readlink(localpath)
-            dst_dir, dst_base = os.path.split(remotepath)
-            return self.run("cd %s; ln -s %s %s" % (dst_dir, link, dst_base))
-        else:
-            command = self.scp + [localpath, '%s@%s:%s' % (self.user, self.ip, remotepath)]
-            return self._internal_run(command, ignore_status=False)
+            localpath = os.path.dirname(localpath) + "/" + os.readlink(localpath)
+        command = self.scp + [localpath, '%s@%s:%s' % (self.user, self.ip, remotepath)]
+        return self._internal_run(command, ignore_status=False)
 
     def copy_from(self, remotepath, localpath):
         command = self.scp + ['%s@%s:%s' % (self.user, self.ip, remotepath), localpath]