diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-29 05:51:18 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-29 05:51:18 -0300 |
| commit | dd151ee816f6d89d08edda36da27880b88c32fae (patch) | |
| tree | e79eff128968a5b4dce45f4e9b5b4938a69df689 /v4l/scripts/do_merge.pl | |
| parent | 9df29ed573b1ae07c6a3cbf4fdbdbbf66c2d3172 (diff) | |
| download | mediapointer-dvb-s2-dd151ee816f6d89d08edda36da27880b88c32fae.tar.gz mediapointer-dvb-s2-dd151ee816f6d89d08edda36da27880b88c32fae.tar.bz2 | |
do_merge.pl: Do a small fix at the building part of the script
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'v4l/scripts/do_merge.pl')
| -rwxr-xr-x | v4l/scripts/do_merge.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/v4l/scripts/do_merge.pl b/v4l/scripts/do_merge.pl index 1ceb0ce75..0a4433a21 100755 --- a/v4l/scripts/do_merge.pl +++ b/v4l/scripts/do_merge.pl @@ -153,7 +153,7 @@ if ($n_heads == 2) { # Test resulting tree print "Testing if the build didn't break compilation. Only errors and warnings will be displayed. Please wait.\n"; -$ret = system ('make all|grep -v "^ CC"|grep -v "^ LD"'); +$ret = system ('make all|egrep -v "^\s*CC"|egrep -v "^\s*LD"'); if ($ret) { print "Build failed. Can't procceed.\n"; |