Patchwork package_ipk: Remove spurious '-i' in grep command for log_check

login
register
mail settings
Submitter Phil Blundell
Date Sept. 26, 2012, 11:55 a.m.
Message ID <1348660520.31293.104.camel@phil-desktop>
Download mbox | patch
Permalink /patch/37267/
State Accepted
Commit 57dcacbd6f35ae2d6b505f044bbefad35da66959
Headers show

Comments

Phil Blundell - Sept. 26, 2012, 11:55 a.m.
ipk_log_check uses a case-sensitive grep (which is correct) when deciding
whether there were any errors or not.  But if it decides that there were, it
then uses a case-insensitive grep to display them.  This results in a large
amount of irrelevant and confusing output which makes it hard to see the real
errors amongst the noise.

Suppress this by removing the unwanted -i.

Signed-off-by: Phil Blundell <pb@pbcl.net>
---
 meta/classes/package_ipk.bbclass |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Saul Wold - Sept. 27, 2012, 3:53 p.m.
On 09/26/2012 04:55 AM, Phil Blundell wrote:
> ipk_log_check uses a case-sensitive grep (which is correct) when deciding
> whether there were any errors or not.  But if it decides that there were, it
> then uses a case-insensitive grep to display them.  This results in a large
> amount of irrelevant and confusing output which makes it hard to see the real
> errors amongst the noise.
>
> Suppress this by removing the unwanted -i.
>
> Signed-off-by: Phil Blundell <pb@pbcl.net>
> ---
>   meta/classes/package_ipk.bbclass |    2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
> index efe299e..59cb856 100644
> --- a/meta/classes/package_ipk.bbclass
> +++ b/meta/classes/package_ipk.bbclass
> @@ -182,7 +182,7 @@ ipk_log_check() {
>   		then
>   			echo "log_check: There were error messages in the logfile"
>   			printf "log_check: Matched keyword: [$keyword_die]\n\n"
> -			echo "$lf_txt" | grep -v log_check | grep -C 5 -i "$keyword_die"
> +			echo "$lf_txt" | grep -v log_check | grep -C 5 "$keyword_die"
>   			echo ""
>   			do_exit=1
>   		fi
>

Merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index efe299e..59cb856 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -182,7 +182,7 @@  ipk_log_check() {
 		then
 			echo "log_check: There were error messages in the logfile"
 			printf "log_check: Matched keyword: [$keyword_die]\n\n"
-			echo "$lf_txt" | grep -v log_check | grep -C 5 -i "$keyword_die"
+			echo "$lf_txt" | grep -v log_check | grep -C 5 "$keyword_die"
 			echo ""
 			do_exit=1
 		fi