[gnome-continuous-yocto/gnomeostree-3.28-rocko: 1705/8267] oeqa/utils/sshcontrol.py: Allows to copy symlinks to target



commit 37f1e0c154cf542dee2af143760730b53b749d61
Author: Mariano Lopez <mariano lopez linux intel com>
Date:   Tue Jul 26 09:38:57 2016 +0000

    oeqa/utils/sshcontrol.py: Allows to copy symlinks to target
    
    Currently when copying a symlink to the target it will fail
    throwing an exception. This will recreate symlinks from the
    system performing the tests to the device under tests.
    
    [YOCTO #9932]
    
    (From OE-Core rev: 5705b7a55bc300e14c34b0530f4d49df101edd3c)
    
    Signed-off-by: Mariano Lopez <mariano lopez linux intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/lib/oeqa/utils/sshcontrol.py |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/meta/lib/oeqa/utils/sshcontrol.py b/meta/lib/oeqa/utils/sshcontrol.py
index f5d46e0..da485ee 100644
--- a/meta/lib/oeqa/utils/sshcontrol.py
+++ b/meta/lib/oeqa/utils/sshcontrol.py
@@ -147,8 +147,13 @@ class SSHControl(object):
         return self._internal_run(command, timeout, self.ignore_status)
 
     def copy_to(self, localpath, remotepath):
-        command = self.scp + [localpath, '%s@%s:%s' % (self.user, self.ip, remotepath)]
-        return self._internal_run(command, ignore_status=False)
+        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)
 
     def copy_from(self, remotepath, localpath):
         command = self.scp + ['%s@%s:%s' % (self.user, self.ip, remotepath), localpath]


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]