[oe-commits] [openembedded-core] 41/49: oe-selftest: devtool: Support meta being a symbolic link

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch sumo
in repository openembedded-core.

commit 3eb59559ecd2e93fb590a330b47de1db0750fc0b
Author: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
AuthorDate: Sun Oct 21 01:20:59 2018 +0200

    oe-selftest: devtool: Support meta being a symbolic link
    
    oe-selftest's devtool tests have been broken since commit 2457cd57
    (oe-selftest: devtool: avoid parallel races by using temporary copy of
    core) if meta is a symbolic link.
    
    (From OE-Core rev: daba6c5a991b370709d17e51305334f55a3858ec)
    
    Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta/lib/oeqa/selftest/cases/devtool.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py
index 3d77497..0ce90a4 100644
--- a/meta/lib/oeqa/selftest/cases/devtool.py
+++ b/meta/lib/oeqa/selftest/cases/devtool.py
@@ -32,8 +32,9 @@ def setUpModule():
             # This helps us match exactly when we're using this path later
             canonical_layerpath += '/'
         if not edited_layers and canonical_layerpath.endswith('/meta/'):
+            canonical_layerpath = os.path.realpath(canonical_layerpath) + '/'
             edited_layers.append(layerpath)
-            oldmetapath = layerpath
+            oldmetapath = os.path.realpath(layerpath)
             result = runCmd('git rev-parse --show-toplevel', cwd=canonical_layerpath)
             oldreporoot = result.output.rstrip()
             newmetapath = os.path.join(corecopydir, os.path.relpath(oldmetapath, oldreporoot))

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.