[oe-commits] [openembedded-core] 06/27: archiver: avoid empty incfile in ar_recipe

[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 e5b2de3a9665575cc4ad1700381b61e3c99ed6af
Author: grygorii tertychnyi <gtertych at cisco.com>
AuthorDate: Fri Nov 1 09:10:43 2019 +0200

    archiver: avoid empty incfile in ar_recipe
    
    do_ar_recipe fails on perf recipe on line:
    
    include ${@bb.utils.contains('PACKAGECONFIG', 'scripting', 'perf-perl.inc', '', d)}
    
    1. "${...}" part expands into empty string
    2. bb.utils.which() takes empty string and returns first directory name from bbpath
    3. shutil.copy() fails on copying directory:
    
    Exception: IsADirectoryError: [Errno 21] Is a directory: ......
    
    Hence, check "incfile" variable on each step.
    
    Signed-off-by: grygorii tertychnyi <gtertych at cisco.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/archiver.bbclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index 093e2d9..7c46cff 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -441,9 +441,10 @@ python do_ar_recipe () {
             incfile = include_re.match(line).group(1)
         if incfile:
             incfile = d.expand(incfile)
+        if incfile:
             incfile = bb.utils.which(bbpath, incfile)
-            if incfile:
-                shutil.copy(incfile, outdir)
+        if incfile:
+            shutil.copy(incfile, outdir)
 
     create_tarball(d, outdir, 'recipe', d.getVar('ARCHIVER_OUTDIR'))
     bb.utils.remove(outdir, recurse=True)

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