Midori Web Browser

Merge lp:~midori/midori/lotsBuilds into lp:midori

  1. lotsBuilds
  2. Merge into trunk
Proposed by Cris Dywan
Status: Merged
Approved by: Paweł Forysiuk
Approved revision: 6520
Merged at revision: 6521
Proposed branch: lp:~midori/midori/lotsBuilds
Merge into: lp:midori
Diff against target: 23 lines (+2/-2)
2 files modified
tests/license.sh (+1/-1)
tests/potfiles.sh (+1/-1)
To merge this branch: bzr merge lp:~midori/midori/lotsBuilds
Reviewer Review Type Date Requested Status
Paweł Forysiuk Approve
Review via email: mp+198812@code.launchpad.net

Commit message

Skip folders starting with _ from license and potfiles checks

To post a comment you must log in.
Revision history for this message
Paweł Forysiuk (tuxator) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/license.sh'
2--- tests/license.sh 2012-11-25 16:43:57 +0000
3+++ tests/license.sh 2013-12-12 19:01:25 +0000
4@@ -9,5 +9,5 @@
5 test -z $(which licensecheck) && echo ...SKIPPED: not installed && return 0
6 test -n "$SRCDIR" && cd $SRCDIR
7 test -z "$BLDDIR" && BLDDIR=_build
8-find . \! -path './.*/*' -a \! -path "./$BLDDIR/*" -a \! -path "./debian/*" | xargs licensecheck | grep UNKNOWN && exit 1
9+find . \! -path './.*/*' -a \! -path "./$BLDDIR/*" -a \! -path "./_*/*" -a \! -path "./debian/*" | xargs licensecheck | grep UNKNOWN && exit 1
10 echo ...OK
11
12=== modified file 'tests/potfiles.sh'
13--- tests/potfiles.sh 2013-09-08 00:02:47 +0000
14+++ tests/potfiles.sh 2013-12-12 19:01:25 +0000
15@@ -8,7 +8,7 @@
16 echo Checking POTFILES.in for completeness
17 test -n "$SRCDIR" && cd $SRCDIR
18 test -z "$BLDDIR" && BLDDIR=_build
19-for i in $(find . -regextype posix-egrep \! -regex "./($BLDDIR|debian|tests)/.+" -a -regex './[^.]+.+[.](vala|c)'); do
20+for i in $(find . -regextype posix-egrep \! -regex "./($BLDDIR|_.+|debian|tests)/.+" -a -regex './[^.]+.+[.](vala|c)'); do
21 grep -q $(basename $i) po/POTFILES.in || FILES="$FILES$i\n"
22 done
23 test -n "$FILES" && echo "$FILES...FAILED"

Subscribers

People subscribed via source and target branches

to all changes: