summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2018-03-23 21:55:14 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-28 11:56:06 +0100
commit7877761534b0c2492da6289e9f2269d41b6ed464 (patch)
tree06e3029f340d6dc2fac7e9cffc0aaf7056dbea4b
parent1a9878cdb1cdb807c47e852b780c8ef9b93a214e (diff)
downloadopenembedded-core-contrib-7877761534b0c2492da6289e9f2269d41b6ed464.tar.gz
openembedded-core-contrib-7877761534b0c2492da6289e9f2269d41b6ed464.tar.bz2
openembedded-core-contrib-7877761534b0c2492da6289e9f2269d41b6ed464.zip
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@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/classes/package.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 83f53a49ef..504c0232ef 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