Patchwork sstate-cache-management: hide error message when one of possible layer location doesn't exist

login
register
mail settings
Submitter Martin Jansa
Date Sept. 27, 2012, 7:36 a.m.
Message ID <1348731373-27278-1-git-send-email-Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/37333/
State Accepted
Commit b02d334e0e6a19a1bf3550add68f5770a835c772
Headers show

Comments

Martin Jansa - Sept. 27, 2012, 7:36 a.m.
* fixes [YOCTO #3116]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 scripts/sstate-cache-management.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Saul Wold - Sept. 27, 2012, 4:35 p.m.
On 09/27/2012 12:36 AM, Martin Jansa wrote:
> * fixes [YOCTO #3116]
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>   scripts/sstate-cache-management.sh | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/sstate-cache-management.sh b/scripts/sstate-cache-management.sh
> index f519555..4c06fe8 100755
> --- a/scripts/sstate-cache-management.sh
> +++ b/scripts/sstate-cache-management.sh
> @@ -174,7 +174,7 @@ remove_duplicated () {
>     topdir=$(dirname $oe_core_dir)
>     tunedirs="`find $topdir/meta* ${oe_core_dir}/meta* $layers -path '*/meta*/conf/machine/include'`"
>     [ -n "$tunedirs" ] || echo_error "Can't find the tune directory"
> -  all_machines="`find $topdir/meta* ${oe_core_dir}/meta* $layers -path '*/meta*/conf/machine/*' -name '*.conf' | sed -e 's/.*\///' -e 's/.conf$//'`"
> +  all_machines="`find $topdir/meta* ${oe_core_dir}/meta* $layers -path '*/meta*/conf/machine/*' -name '*.conf' 2>/dev/null | sed -e 's/.*\///' -e 's/.conf$//'`"
>     all_archs=`grep -r -h "^AVAILTUNES .*=" $tunedirs | sed -e 's/.*=//' -e 's/\"//g'`
>     # Add the qemu and native archs
>     # Use the "_" to substitute "-", e.g., x86-64 to x86_64
>

Merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/scripts/sstate-cache-management.sh b/scripts/sstate-cache-management.sh
index f519555..4c06fe8 100755
--- a/scripts/sstate-cache-management.sh
+++ b/scripts/sstate-cache-management.sh
@@ -174,7 +174,7 @@  remove_duplicated () {
   topdir=$(dirname $oe_core_dir)
   tunedirs="`find $topdir/meta* ${oe_core_dir}/meta* $layers -path '*/meta*/conf/machine/include'`"
   [ -n "$tunedirs" ] || echo_error "Can't find the tune directory"
-  all_machines="`find $topdir/meta* ${oe_core_dir}/meta* $layers -path '*/meta*/conf/machine/*' -name '*.conf' | sed -e 's/.*\///' -e 's/.conf$//'`"
+  all_machines="`find $topdir/meta* ${oe_core_dir}/meta* $layers -path '*/meta*/conf/machine/*' -name '*.conf' 2>/dev/null | sed -e 's/.*\///' -e 's/.conf$//'`"
   all_archs=`grep -r -h "^AVAILTUNES .*=" $tunedirs | sed -e 's/.*=//' -e 's/\"//g'`
   # Add the qemu and native archs
   # Use the "_" to substitute "-", e.g., x86-64 to x86_64