From: Mike Crowe <mac@mcrowe.com>
To: openembedded-core@lists.openembedded.org
Cc: Mike Crowe <mac@mcrowe.com>, Mike Crowe <mcrowe@mcrowe.com>
Subject: [PATCH 2/2] rootfs-postcommands: Cope with empty IMAGE_LINK_NAME in write_image_test_data
Date: Mon, 15 Jul 2019 13:51:00 +0100 [thread overview]
Message-ID: <20190715125100.14288-2-mac@mcrowe.com> (raw)
In-Reply-To: <20190715125100.14288-1-mac@mcrowe.com>
From: Mike Crowe <mcrowe@mcrowe.com>
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@mcrowe.com>
---
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 a2fe3dea2b..6cec23ef1a 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)
--
2.20.1
prev parent reply other threads:[~2019-07-15 12:51 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-15 12:50 [PATCH 1/2] rootfs-postcommands: Cope with empty IMAGE_LINK_NAME in write_image_manifest Mike Crowe
2019-07-15 12:51 ` Mike Crowe [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190715125100.14288-2-mac@mcrowe.com \
--to=mac@mcrowe.com \
--cc=mcrowe@mcrowe.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.