[oe-commits] [openembedded-core] 13/13: rootfs-postcommands: Cope with empty IMAGE_LINK_NAME in write_image_test_data

git at git.openembedded.org git at git.openembedded.org
Mon Jul 15 13:02:06 UTC 2019


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 dbe876d33d3b8133c4590626f38d515a4273f4e6
Author: Mike Crowe <mcrowe at mcrowe.com>
AuthorDate: Mon Jul 15 13:51:00 2019 +0100

    rootfs-postcommands: Cope with empty IMAGE_LINK_NAME in write_image_test_data
    
    Ensure that we don't create an image test data symlink named
    ".testdata.json" when IMAGE_LINK_NAME is empty.
    
    Signed-off-by: Mike Crowe <mac at mcrowe.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/rootfs-postcommands.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass
index a2fe3de..6cec23e 100644
--- a/meta/classes/rootfs-postcommands.bbclass
+++ b/meta/classes/rootfs-postcommands.bbclass
@@ -328,7 +328,7 @@ python write_image_test_data() {
     searchString = "%s/"%(d.getVar("TOPDIR")).replace("//","/")
     export2json(d, testdata_name, searchString=searchString, replaceString="")
 
-    if os.path.exists(testdata_name):
+    if os.path.exists(testdata_name) and link_name:
         testdata_link = os.path.join(deploy_dir, "%s.testdata.json" % link_name)
         if os.path.lexists(testdata_link):
             os.remove(testdata_link)

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


More information about the Openembedded-commits mailing list