[oe-commits] [openembedded-core] 05/30: runqemu: use realpath for imgdir

[git at git.openembedded.org]

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

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

commit c3e36ecdedf83257f046038aa38c06ce299231d5
Author: Robert Yang <liezhi.yang at windriver.com>
AuthorDate: Wed Apr 5 23:41:37 2017 -0700

    runqemu: use realpath for imgdir
    
    The DEPLOY_DIR_IMAGE maybe relative or absolute path since it can be
    read from env vars, so use realpath for both imgdir and
    DEPLOY_DIR_IMAGE when compare.
    
    Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 scripts/runqemu | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/runqemu b/scripts/runqemu
index 1b330b7..b964622 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -705,8 +705,8 @@ class BaseConfig(object):
         # artefacts are relative to that file, rather than in whatever
         # directory DEPLOY_DIR_IMAGE in the conf file points to.
         if self.qbconfload:
-            imgdir = os.path.dirname(self.qemuboot)
-            if imgdir != self.get('DEPLOY_DIR_IMAGE'):
+            imgdir = os.path.realpath(os.path.dirname(self.qemuboot))
+            if imgdir != os.path.realpath(self.get('DEPLOY_DIR_IMAGE')):
                 logger.info('Setting DEPLOY_DIR_IMAGE to folder containing %s (%s)' % (self.qemuboot, imgdir))
                 self.set('DEPLOY_DIR_IMAGE', imgdir)
 

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