Patchwork [5/5] glibc: fix false failure

login
mail settings
Submitter Nitin A Kamble
Date July 12, 2011, 7:02 p.m.
Message ID <5fc1498aa6920e8d07e831d10ef1efd656fbfa8b.1310497097.git.nitin.a.kamble@intel.com>
Download mbox | patch
Permalink /patch/7451/
State New, archived
Headers show

Comments

Nitin A Kamble - July 12, 2011, 7:02 p.m.
From: Nitin A Kamble <nitin.a.kamble@intel.com>

do not just fail if grep does not match the locale name in the list

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 meta/recipes-core/glibc/glibc.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Richard Purdie - July 13, 2011, 11:16 a.m.
On Tue, 2011-07-12 at 12:02 -0700, nitin.a.kamble@intel.com wrote:
> From: Nitin A Kamble <nitin.a.kamble@intel.com>
> 
> do not just fail if grep does not match the locale name in the list
> 
> Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
> ---
>  meta/recipes-core/glibc/glibc.inc |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)

Merged to master, thanks.

Richard

Patch

diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc
index b16ebd3..57d693c 100644
--- a/meta/recipes-core/glibc/glibc.inc
+++ b/meta/recipes-core/glibc/glibc.inc
@@ -48,7 +48,7 @@  do_rig_locales() {
 		head -n 3 $INFILE > $OUTFILE
 		for i in ${LIMIT_BUILT_LOCALES}; do
 			echo 
-			grep $i $INFILE >> $OUTFILE
+			grep $i $INFILE >> $OUTFILE || true
 		done
 		head --lines=-1 $OUTFILE > $INFILE
 		tail --lines=1 $OUTFILE | sed 's#\\##' >> $INFILE