[oe-commits] Mike Looijmans : image.py: Allow IMAGE_LINK_NAME to be empty

git at git.openembedded.org git at git.openembedded.org
Sat Sep 12 22:02:29 UTC 2015


Module: openembedded-core.git
Branch: master-next
Commit: 7f03dd50de76f0b5c3a10c514e920615ffaa846c
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=7f03dd50de76f0b5c3a10c514e920615ffaa846c

Author: Mike Looijmans <mike.looijmans at topic.nl>
Date:   Fri Sep 11 19:02:44 2015 +0200

image.py: Allow IMAGE_LINK_NAME to be empty

When IMAGE_LINK_NAME is empty, OE will try to create a "blank" link instead
of just skipping it. The code checks for "link_name is not None" which will
never evaluate to true. Change the test to a simple "if link_name:" so it
no longer attempt to create links when the variable is an empty string.

Signed-off-by: Mike Looijmans <mike.looijmans at topic.nl>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/lib/oe/image.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oe/image.py b/meta/lib/oe/image.py
index 5b77306..2361955 100644
--- a/meta/lib/oe/image.py
+++ b/meta/lib/oe/image.py
@@ -194,7 +194,7 @@ class Image(ImageDepGraph):
 
         os.chdir(deploy_dir)
 
-        if link_name is not None:
+        if link_name:
             for type in subimages:
                 if os.path.exists(img_name + ".rootfs." + type):
                     dst = link_name + "." + type



More information about the Openembedded-commits mailing list