[oe-commits] Mark Hatle : package_rpm.bbclass: Add support for filenames with spaces

git at git.openembedded.org git at git.openembedded.org
Tue Jan 17 16:29:59 UTC 2012


Module: openembedded-core.git
Branch: master
Commit: a0f5dd25a37fe3b8664c2133e80b6214559f93f6
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=a0f5dd25a37fe3b8664c2133e80b6214559f93f6

Author: Mark Hatle <mark.hatle at windriver.com>
Date:   Tue Jan 17 09:47:49 2012 -0600

package_rpm.bbclass: Add support for filenames with spaces

Files with spaces must be fully quoted in an RPM spec file.  It was
easier to quote all file paths, then to do it selectively.

Signed-off-by: Mark Hatle <mark.hatle at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/package_rpm.bbclass |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 2d92efe..bac9de5 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -543,12 +543,12 @@ python write_specfile () {
 			path = rootpath.replace(walkpath, "")
 			for dir in dirs:
 				# All packages own the directories their files are in...
-				target.append("%dir " + path + "/" + dir)
+				target.append('%dir "' + path + '/' + dir + '"')
 			for file in files:
-				if conffiles.count(path + "/" + file):
-					target.append("%config " + path + "/" + file)
+				if conffiles.count(path + '/' + file):
+					target.append('%config "' + path + '/' + file + '"')
 				else:
-					target.append(path + "/" + file)
+					target.append('"' + path + '/' + file + '"')
 
 	# Prevent the prerm/postrm scripts from being run during an upgrade
 	def wrap_uninstall(scriptvar):





More information about the Openembedded-commits mailing list