[oe-commits] [openembedded-core] 15/22: package.bbclass: use single quotes for path passed to file in isELF()

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 7877761534b0c2492da6289e9f2269d41b6ed464
Author: Andre McCurdy <armccurdy at gmail.com>
AuthorDate: Fri Mar 23 21:55:14 2018 -0700

    package.bbclass: use single quotes for path passed to file in isELF()
    
    Apparently there are recipes in the wild which generate files with
    filenames containing '$' characters - which cause errors during
    packaging.
    
    Instead of adding another special case to escape '$' characters when
    constructing the command passed to oe.utils.getstatusoutput(), switch
    to using single quotes to quote the path - and therefore make isELF()
    consistent with the way filenames and paths are quoted by every other
    caller of oe.utils.getstatusoutput() in oe-core.
    
    Signed-off-by: Andre McCurdy <armccurdy at gmail.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/classes/package.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 83f53a4..504c023 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -918,7 +918,7 @@ python split_and_strip_files () {
     # 16 - kernel module
     def isELF(path):
         type = 0
-        ret, result = oe.utils.getstatusoutput("file \"%s\"" % path.replace("\"", "\\\""))
+        ret, result = oe.utils.getstatusoutput("file '%s'" % path)
 
         if ret:
             msg = "split_and_strip_files: 'file %s' failed" % path

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