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

Proposed by Daniel van Vugt on 2012-07-26
Status: Merged
Approved by: Sam Spilsbury on 2012-07-26
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 2012-07-26 Approve on 2012-07-26
Christopher Lee 2012-07-26 Pending
Michal Hruby 2012-07-26 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.
Sam Spilsbury (smspillaz) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmake/CompizCommon.cmake'
2--- cmake/CompizCommon.cmake 2012-07-25 12:52:33 +0000
3+++ cmake/CompizCommon.cmake 2012-07-26 11:15:28 +0000
4@@ -399,10 +399,9 @@
5 add_custom_command (
6 OUTPUT ${_dst}
7 COMMAND cat ${_src} |
8- sed -e 's;<_;<;g' -e 's;</_;</;g' >
9+ sed -e 's:<_:<:g' -e 's:</_:</:g' >
10 ${_dst}
11 DEPENDS ${_src}
12- VERBATIM
13 )
14 endif ()
15 endfunction ()
16@@ -427,10 +426,9 @@
17 add_custom_command (
18 OUTPUT ${_dst}
19 COMMAND cat ${_src} |
20- sed -e 's;^_;;g' >
21+ sed -e 's:^_::g' >
22 ${_dst}
23 DEPENDS ${_src}
24- VERBATIM
25 )
26 endif ()
27 endfunction ()

Subscribers

People subscribed via source and target branches