dim: Improve the error output when rebuild-nightly fails
PATCH 1/1 dim: Improve the error output when rebuild-nightly fails
Joonas rightly complained that the current output is useless and just confuses.
Cc Joonas Lahtinen <[email protected]>
Signed-off-by Daniel Vetter <[email protected]>
--- dim | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
dim +4 -2
@@ -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
Signature · 6 lines
2.10.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 14 lines · Daniel Vetter
Joonas rightly complained that the current output is useless and just confuses.
Cc Joonas Lahtinen <[email protected]>Signed-off-by Daniel Vetter <[email protected]>--- dim | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)dim +0
-0
dim function update_linux_next # branch next next-fixes fixes · line 328
Quoted 5 lines
dim +1
-1@@ -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?
Quoted 8 lines
dim +3
-1if [ -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
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 16 lines · Jani Nikula
Quoted 15 lines · Daniel Vetter
Joonas rightly complained that the current output is useless and just confuses.
Cc Joonas Lahtinen <[email protected]>Signed-off-by Daniel Vetter <[email protected]>--- dim | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)dim +0
-0@@ -325,9 +325,11 @@ function update_linux_next # branch next next-fixes fixes
Quoted 6 lines
dim function update_linux_next # branch next next-fixes fixes · line 328
Quoted 4 lines
dim +1
-1function check_conflicts { - if git diff | grep '\(<<<<<<<\|=======\|>>>>>>>\||||||||\)' ; then + if git diff | grep '\(<<<<<<<\|=======\|>>>>>>>\||||||||\)' &> /dev/null ; thengrep -q instead of redirecting to
/dev/null?
Will do.
-Daniel
Quoted 12 lines
Quoted 9 lines
dim +3
-1if [ -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 fiSignature · 1 line
Jani Nikula, Intel Open Source Technology Center
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx