diff options
| author | Domen Vrankar <domen.vrankar@gmail.com> | 2015-01-07 19:33:27 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-02-24 13:44:36 (GMT) |
| commit | 5857ca5e0d6c6f04486153f69184ba5d76b13f0b (patch) | |
| tree | 7d4738d66c72673cea938d4a4ccb052fb145e9d8 /Modules | |
| parent | cb16c7844dce627ab40f404c6ac49db3cde7b0c0 (diff) | |
| download | CMake-5857ca5e0d6c6f04486153f69184ba5d76b13f0b.zip CMake-5857ca5e0d6c6f04486153f69184ba5d76b13f0b.tar.gz CMake-5857ca5e0d6c6f04486153f69184ba5d76b13f0b.tar.bz2 | |
CPackRPM: Drop explicit handling of '@' symbols that breaks them (#14782)
The change in commit v2.8.12~218^2 (CPackRPM protect '@' character in
filename processed in the spec file, 2013-07-05) was not necessary after
commit v2.8.12~439^2 (Add support for componentized USER spec file,
2013-04-01). The latter replaced ${VAR} references in the spec file
template string with \@VAR\@ references, thus protecting '@' symbols
automatically. This caused CPackRPM to break paths with @ symbols.
Revert the change to fix the behavior, and add a test case.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CPackRPM.cmake | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake index 6ce18bf..cb987f8 100644 --- a/Modules/CPackRPM.cmake +++ b/Modules/CPackRPM.cmake @@ -1175,13 +1175,6 @@ if(CPACK_RPM_PACKAGE_DEBUG) message("CPackRPM:Debug: CPACK_TEMPORARY_PACKAGE_FILE_NAME = ${CPACK_TEMPORARY_PACKAGE_FILE_NAME}") endif() -# protect @ in pathname in order to avoid their -# interpretation during the configure_file step -set(CPACK_RPM_INSTALL_FILES_LIST "${CPACK_RPM_INSTALL_FILES}") -set(PROTECTED_AT "@") -string(REPLACE "@" "\@PROTECTED_AT\@" CPACK_RPM_INSTALL_FILES "${CPACK_RPM_INSTALL_FILES_LIST}") -set(CPACK_RPM_INSTALL_FILES_LIST "") - # # USER generated/provided spec file handling. # @@ -1292,9 +1285,6 @@ else() configure_file(${CPACK_RPM_BINARY_SPECFILE}.in ${CPACK_RPM_BINARY_SPECFILE} @ONLY) endif() -# remove AT protection -unset(PROTECTED_AT) - if(RPMBUILD_EXECUTABLE) # Now call rpmbuild using the SPECFILE execute_process( |