CMake Extras

Merge lp://staging/~pete-woods/cmake-extras/fix-filtering into lp://staging/cmake-extras

  1. fix-filtering
  2. Merge into trunk
Proposed by Pete Woods
Status: Merged
Approved by: Pete Woods
Approved revision: 75
Merged at revision: 75
Proposed branch: lp://staging/~pete-woods/cmake-extras/fix-filtering
Merge into: lp://staging/cmake-extras
Prerequisite: lp://staging/~larryprice/cmake-extras/multiple-programming-languages
Diff against target: 40 lines (+7/-4)
2 files modified
examples/intltool-demo/po/CMakeLists.txt (+1/-2)
src/Intltool/IntltoolConfig.cmake (+6/-2)
To merge this branch: bzr merge lp://staging/~pete-woods/cmake-extras/fix-filtering
Reviewer Review Type Date Requested Status
Pete Woods Approve
Review via email: mp+321726@code.staging.launchpad.net

This proposal supersedes a proposal from 2017-03-24.

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.

To post a comment you must log in.
Revision history for this message
Pete Woods (pete-woods) wrote : Posted in a previous version of this proposal

As per the other review. Your fix looks good, but please add a regression test for it.

Revision history for this message
Pete Woods (pete-woods) : Posted in a previous version of this proposal
review: Needs Fixing
Revision history for this message
Larry Price (larryprice) wrote : Posted in a previous version of this proposal

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.

Revision history for this message
Pete Woods (pete-woods) wrote : Posted in a previous version of this proposal

No, that's totally fine. Thanks for the red-green explanation :)

review: Approve
Revision history for this message
Pete Woods (pete-woods) wrote : Posted in a previous version of this proposal

Sadly your branches trivially conflict with each other.

Revision history for this message
Pete Woods (pete-woods) wrote :

I've resubmitted this proposal with the conflicts resolved

Revision history for this message
Pete Woods (pete-woods) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: