]> code.ossystems Code Review - openembedded-core.git/commitdiff
image.py: Allow IMAGE_LINK_NAME to be empty
authorMike Looijmans <mike.looijmans@topic.nl>
Fri, 11 Sep 2015 17:02:44 +0000 (19:02 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 12 Sep 2015 22:01:54 +0000 (23:01 +0100)
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@topic.nl>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/lib/oe/image.py

index 5b77306065462fd0e1a77b3e5a74b3635c04138d..2361955971bf3fb7956923df0272281c846cdee6 100644 (file)
@@ -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