[oe-commits] Sébastien Mennetrier =?UTF-8?Q?=20?=: package_rpm.bbclass : escape "%" in files and directories name

[git at git.openembedded.org]

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

Author: Sébastien Mennetrier <smennetrier at voxtok.com>
Date:   Wed May 20 16:48:19 2015 +0200

package_rpm.bbclass : escape "%" in files and directories name

The rpm process replace all the "%name" in the spec file by the name of
the package. So, if the package is composed of some files or directories
named "%name...", the rpm package process failed.

Replace all "%" present in files or directories names by "%%%%%%%%" to
correctly escape "%" due to the number of times that % is treated as an
escape character.  Jeff Johnson says this is the Right Thing To Do.

[ YOCTO #5397 ]

Signed-off-by: Sébastien Mennetrier <smennetrier at voxtok.com>
Signed-off-by: Michaël Burtin <mburtin at voxtok.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/classes/package_rpm.bbclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 271b9ae..8fd0685 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -196,6 +196,7 @@ python write_specfile () {
             path = rootpath.replace(walkpath, "")
             if path.endswith("DEBIAN") or path.endswith("CONTROL"):
                 continue
+            path = path.replace("%", "%%%%%%%%")
 
             # Treat all symlinks to directories as normal files.
             # os.walk() lists them as directories.
@@ -214,6 +215,7 @@ python write_specfile () {
                 for dir in dirs:
                     if dir == "CONTROL" or dir == "DEBIAN":
                         continue
+                    dir = dir.replace("%", "%%%%%%%%")
                     # All packages own the directories their files are in...
                     target.append('%dir "' + path + '/' + dir + '"')
             else:
@@ -227,6 +229,7 @@ python write_specfile () {
             for file in files:
                 if file == "CONTROL" or file == "DEBIAN":
                     continue
+                file = file.replace("%", "%%%%%%%%")
                 if conffiles.count(path + '/' + file):
                     target.append('%config "' + path + '/' + file + '"')
                 else: