From c06697fe13c17e2272d3df4dce44aa4ede1e0e2d Mon Sep 17 00:00:00 2001
From: Jani Nikula <jani.nikula@intel.com>
Date: Thu, 30 Mar 2017 10:31:05 +0300
Subject: [PATCH] dim: do not bail out if the script is not up-to-date
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@intel.com>
---
dim | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dim b/dim
index 33d5fd3..8671bcb 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
--
GitLab