Merge lp:~vanvugt/compiz/fix-1029383 into lp:compiz/0.9.8

Proposed by Daniel van Vugt
Status: Merged
Approved by: Sam Spilsbury
Approved revision: 3294
Merged at revision: 3294
Proposed branch: lp:~vanvugt/compiz/fix-1029383
Merge into: lp:compiz/0.9.8
Diff against target: 27 lines (+2/-4)
1 file modified
cmake/CompizCommon.cmake (+2/-4)
To merge this branch: bzr merge lp:~vanvugt/compiz/fix-1029383
Reviewer Review Type Date Requested Status
Sam Spilsbury Approve
Christopher Lee Pending
Michal Hruby Pending
Review via email: mp+116830@code.launchpad.net

Commit message

Fix incorrect shell expansion, leading to invalid "sed" syntax (LP: #1029383)

Description of the change

Fix incorrect shell expansion, leading to invalid "sed" syntax (LP: #1029383)

UNBLOCK

To post a comment you must log in.
Revision history for this message
Sam Spilsbury (smspillaz) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'cmake/CompizCommon.cmake'
--- cmake/CompizCommon.cmake 2012-07-25 12:52:33 +0000
+++ cmake/CompizCommon.cmake 2012-07-26 11:15:28 +0000
@@ -399,10 +399,9 @@
399 add_custom_command (399 add_custom_command (
400 OUTPUT ${_dst}400 OUTPUT ${_dst}
401 COMMAND cat ${_src} |401 COMMAND cat ${_src} |
402 sed -e 's;<_;<;g' -e 's;</_;</;g' > 402 sed -e 's:<_:<:g' -e 's:</_:</:g' >
403 ${_dst}403 ${_dst}
404 DEPENDS ${_src}404 DEPENDS ${_src}
405 VERBATIM
406 )405 )
407 endif ()406 endif ()
408endfunction ()407endfunction ()
@@ -427,10 +426,9 @@
427 add_custom_command (426 add_custom_command (
428 OUTPUT ${_dst}427 OUTPUT ${_dst}
429 COMMAND cat ${_src} |428 COMMAND cat ${_src} |
430 sed -e 's;^_;;g' >429 sed -e 's:^_::g' >
431 ${_dst}430 ${_dst}
432 DEPENDS ${_src}431 DEPENDS ${_src}
433 VERBATIM
434 )432 )
435 endif ()433 endif ()
436endfunction ()434endfunction ()

Subscribers

People subscribed via source and target branches