From: Felipe F. Tonello <eu@felipetonello.com>
Date: Fri, 1 Nov 2013 03:51:51 +0000 (-0700)
Subject: package.bbclass: Fix split_and_strip_files when file has single quote (')
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f84cc99bd1ea946317c87f00ea343b80d9c9a4d;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

package.bbclass: Fix split_and_strip_files when file has single quote (')

Fix false error report when a file that has a single quote by escaping
the single quote. Some packages might install files with quotes, such
as music files and other types, that will cause the problem.

(From OE-Core rev: 212471f81d210e596798db5e5d927418090a63a2)

Signed-off-by: Felipe F. Tonello <eu@felipetonello.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

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