| Submitter | Mark Hatle |
|---|---|
| Date | Jan. 17, 2012, 3:47 p.m. |
| Message ID | <c7289878f3f3fbcc7da909a962903b7e39ecbbee.1326815198.git.mark.hatle@windriver.com> |
| Download | mbox | patch |
| Permalink | /patch/19587/ |
| State | Accepted |
| Commit | a0f5dd25a37fe3b8664c2133e80b6214559f93f6 |
| Headers | show |
Comments
Op 17 jan. 2012, om 16:47 heeft Mark Hatle het volgende geschreven: > 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@windriver.com> Tested-by: Koen Kooi <koen@dominion.thruhere.net>
Patch
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):
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@windriver.com> --- meta/classes/package_rpm.bbclass | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)