Skip to contentSkip to conversation

dim: Improve the error output when rebuild-nightly fails

PATCH In review Daniel Vetter 3 participants 3 messages Nov 11, 2016

lore
Share & tools
lore
#0 lore raw

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]>
---
 dim | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
dim +4 -2
index dcdc19a9c82d..eba20509cda8 100755
@@ -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
#1 lore raw
Quoted 14 lines · Daniel Vetter

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

Cc Joonas Lahtinen <[email protected]>
---
 dim | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
dim +0 -0
index dcdc19a9c82d..eba20509cda8 100755

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 -1
 		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 · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw
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]>
---
 dim | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
dim +0 -0
index dcdc19a9c82d..eba20509cda8 100755
@@ -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 -1
 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

Quoted 12 lines
Quoted 9 lines
dim +3 -1
 		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 · 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