[Intel-gfx] [dim PATCH 1/4] dim: do not bail out if the script is not up-to-date

Jani Nikula jani.nikula at intel.com
Tue Apr 4 13:58:59 UTC 2017


It's rather obnoxious to exit in the middle of something just because
you haven't updated the script. Only issue a warning.

Signed-off-by: Jani Nikula <jani.nikula at intel.com>
---
 dim | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dim b/dim
index 33d5fd3c0303..8671bcb84845 100755
--- a/dim
+++ b/dim
@@ -289,18 +289,18 @@ function dim_uptodate
 
 	if [[ ! -e "$using" ]]; then
 		echoerr "could not figure out the version being used ($using)."
-		exit 1
+		return 1
 	fi
 
 	if [[ ! -e "$DIM_PREFIX/maintainer-tools/.git" ]]; then
 		echoerr "could not find the upstream repo for $dim."
-		exit 1
+		return 1
 	fi
 
 	if ! git --git-dir=$DIM_PREFIX/maintainer-tools/.git show "@{upstream}:dim" |\
 			diff "$using" - >& /dev/null; then
 		echoerr "not running upstream version of the script."
-		exit 1
+		return 1
 	fi
 }
 
@@ -334,7 +334,7 @@ function git_branch_exists # branch
 }
 
 if [[ "$(($(date +%s) % 100))" -eq "0" ]] ; then
-        dim_uptodate
+        dim_uptodate || true
 fi
 
 # get message id from file
-- 
2.1.4



More information about the Intel-gfx mailing list