* [PATCH] dim: Improve the error output when rebuild-nightly fails
@ 2016-11-11 13:21 Daniel Vetter
2016-11-11 13:37 ` Jani Nikula
0 siblings, 1 reply; 3+ messages in thread
From: Daniel Vetter @ 2016-11-11 13:21 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter, 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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] dim: Improve the error output when rebuild-nightly fails
2016-11-11 13:21 [PATCH] dim: Improve the error output when rebuild-nightly fails Daniel Vetter
@ 2016-11-11 13:37 ` Jani Nikula
2016-11-11 16:10 ` Daniel Vetter
0 siblings, 1 reply; 3+ messages in thread
From: Jani Nikula @ 2016-11-11 13:37 UTC (permalink / raw)
To: Intel Graphics Development; +Cc: Daniel Vetter, Daniel Vetter
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] dim: Improve the error output when rebuild-nightly fails
2016-11-11 13:37 ` Jani Nikula
@ 2016-11-11 16:10 ` Daniel Vetter
0 siblings, 0 replies; 3+ messages in thread
From: Daniel Vetter @ 2016-11-11 16:10 UTC (permalink / raw)
To: Jani Nikula; +Cc: Daniel Vetter, Intel Graphics Development, 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-11-11 16:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-11-11 13:21 [PATCH] dim: Improve the error output when rebuild-nightly fails Daniel Vetter
2016-11-11 13:37 ` Jani Nikula
2016-11-11 16:10 ` Daniel Vetter
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.