Merge lp:~larryprice/cmake-extras/fix-filtering into lp:cmake-extras
Status: | Superseded |
---|---|
Proposed branch: | lp:~larryprice/cmake-extras/fix-filtering |
Merge into: | lp:cmake-extras |
Diff against target: |
35 lines (+7/-3) 2 files modified
examples/intltool-demo/po/CMakeLists.txt (+1/-1) src/Intltool/IntltoolConfig.cmake (+6/-2) |
To merge this branch: | bzr merge lp:~larryprice/cmake-extras/fix-filtering |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Pete Woods | 2017-03-24 | Approve on 2017-04-03 | |
Review via email:
|
This proposal has been superseded by a proposal from 2017-04-03.
Commit message
Intltool filtering should filter out files that match any regex.
Description of the change
Intltool filtering should filter out files that match any regex. The current behavior is that any file that *does not match* one regex from the given expressions will be allowed into the filtered list.
Pete Woods (pete-woods) wrote : | # |
- 74. By Larry Price on 2017-03-27
-
Add an additional filter item (breaks old test, fixed by this MP)
Larry Price (larryprice) wrote : | # |
Thanks for giving it a once-over. I changed the FILTER in the test to a list, which broke the original filter test. By adding in this MP, the filter test is fixed. Let me know if you would prefer an individual new test as well.
Pete Woods (pete-woods) wrote : | # |
No, that's totally fine. Thanks for the red-green explanation :)
Pete Woods (pete-woods) wrote : | # |
Sadly your branches trivially conflict with each other.
As per the other review. Your fix looks good, but please add a regression test for it.