[PATCH] dim: Improve the error output when rebuild-nightly fails

[PATCH] dim: Improve the error output when rebuild-nightly fails

[Daniel Vetter]

Joonas rightly complained that the current output is useless and just
confuses.

Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 dim | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dim b/dim
index dcdc19a9c82d..eba20509cda8 100755
--- a/dim
+++ b/dim
@@ -325,9 +325,11 @@ function update_linux_next # branch next next-fixes fixes
 
 function check_conflicts
 {
-	if git diff | grep '\(<<<<<<<\|=======\|>>>>>>>\||||||||\)' ; then
+	if git diff | grep '\(<<<<<<<\|=======\|>>>>>>>\||||||||\)' &> /dev/null ; then
 		if [ -n "$1" ]; then
-			echo $*
+			echoerr $*
+			echoerr "See the section \"Resolving Conflicts when Rebuilding drm-intel-nightly\""
+			echoerr "in the drm-intel.rst documentation for how to handle this situation."
 		fi
 		exit 1
 	fi
-- 
2.10.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] dim: Improve the error output when rebuild-nightly fails

[Jani Nikula]

On Fri, 11 Nov 2016, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> Joonas rightly complained that the current output is useless and just
> confuses.
>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
>  dim | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/dim b/dim
> index dcdc19a9c82d..eba20509cda8 100755
> --- a/dim
> +++ b/dim
> @@ -325,9 +325,11 @@ function update_linux_next # branch next next-fixes fixes
>  
>  function check_conflicts
>  {
> -	if git diff | grep '\(<<<<<<<\|=======\|>>>>>>>\||||||||\)' ; then
> +	if git diff | grep '\(<<<<<<<\|=======\|>>>>>>>\||||||||\)' &> /dev/null ; then

grep -q instead of redirecting to /dev/null?

>  		if [ -n "$1" ]; then
> -			echo $*
> +			echoerr $*
> +			echoerr "See the section \"Resolving Conflicts when Rebuilding drm-intel-nightly\""
> +			echoerr "in the drm-intel.rst documentation for how to handle this situation."
>  		fi
>  		exit 1
>  	fi

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] dim: Improve the error output when rebuild-nightly fails

[Daniel Vetter]

On Fri, Nov 11, 2016 at 03:37:04PM +0200, Jani Nikula wrote:
> On Fri, 11 Nov 2016, Daniel Vetter <daniel.vetter@ffwll.ch> wrote:
> > Joonas rightly complained that the current output is useless and just
> > confuses.
> >
> > Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> > ---
> >  dim | 6 ++++--
> >  1 file changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/dim b/dim
> > index dcdc19a9c82d..eba20509cda8 100755
> > --- a/dim
> > +++ b/dim
> > @@ -325,9 +325,11 @@ function update_linux_next # branch next next-fixes fixes
> >  
> >  function check_conflicts
> >  {
> > -	if git diff | grep '\(<<<<<<<\|=======\|>>>>>>>\||||||||\)' ; then
> > +	if git diff | grep '\(<<<<<<<\|=======\|>>>>>>>\||||||||\)' &> /dev/null ; then
> 
> grep -q instead of redirecting to /dev/null?

Will do.
-Daniel

> 
> >  		if [ -n "$1" ]; then
> > -			echo $*
> > +			echoerr $*
> > +			echoerr "See the section \"Resolving Conflicts when Rebuilding drm-intel-nightly\""
> > +			echoerr "in the drm-intel.rst documentation for how to handle this situation."
> >  		fi
> >  		exit 1
> >  	fi
> 
> -- 
> Jani Nikula, Intel Open Source Technology Center

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx