From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Sat, 27 Jun 2015 07:10:29 +0000 (+0100)
Subject: oeqa/recipetool: Fix symlink resolution
X-Git-Tag: 2015-10~1433
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=878764ab7252f9b5b67b697dcd51b961b673fda0;p=openembedded-core.git

oeqa/recipetool: Fix symlink resolution

Instead of readlink we need to use realpath to resolve any possible
symlink in the file name. I'd got the two confused in the previous
patch. This should really fix selftest failures on the autobuilder.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/lib/oeqa/selftest/recipetool.py b/meta/lib/oeqa/selftest/recipetool.py
index c08b2e4674..b3ca171698 100644
--- a/meta/lib/oeqa/selftest/recipetool.py
+++ b/meta/lib/oeqa/selftest/recipetool.py
@@ -112,7 +112,7 @@ class RecipetoolTests(DevtoolBase):
     def test_recipetool_appendfile_binary(self):
         # Try appending a binary file
         # /bin/ls can be a symlink to /usr/bin/ls
-        ls = os.readlink("/bin/ls")
+        ls = os.path.realpath("/bin/ls")
         result = runCmd('recipetool appendfile %s /bin/ls %s -r coreutils' % (templayerdir, ls))
         self.assertIn('WARNING: ', result.output)
         self.assertIn('is a binary', result.output)