verbis-admin
/
bridgehead
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Until all BBMRI-ERIC bridgeheads are onboarded with git, don't consider missing git info an error

This commit is contained in:
Martin Lablans 2022-11-04 17:24:23 +01:00
parent b28fb2881c
commit 865870ea91
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/update-bridgehead.sh
View File

@ -39,7 +39,7 @@ for DIR in /etc/bridgehead $(pwd); do
OUT="$(git -C $DIR status --porcelain)" OUT="$(git -C $DIR status --porcelain)"
if [ -n "$OUT" ]; then if [ -n "$OUT" ]; then
log WARN "The working directory $DIR is modified. Changed files: $OUT" log WARN "The working directory $DIR is modified. Changed files: $OUT"
report_error 1 "The working directory $DIR is modified. Changed files: $OUT" report_error log "The working directory $DIR is modified. Changed files: $OUT"
fi fi
if [ "$(git -C $DIR config --get credential.helper)" != "$CREDHELPER" ]; then if [ "$(git -C $DIR config --get credential.helper)" != "$CREDHELPER" ]; then
log "INFO" "Configuring repo to use bridgehead git credential helper." log "INFO" "Configuring repo to use bridgehead git credential helper."
@ -54,7 +54,7 @@ for DIR in /etc/bridgehead $(pwd); do
OUT=$(git -c http.proxy=$HTTP_PROXY_URL -c https.proxy=$HTTPS_PROXY_URL -C $DIR fetch 2>&1 && git -c http.proxy=$HTTP_PROXY_URL -c https.proxy=$HTTPS_PROXY_URL -C $DIR pull 2>&1) OUT=$(git -c http.proxy=$HTTP_PROXY_URL -c https.proxy=$HTTPS_PROXY_URL -C $DIR fetch 2>&1 && git -c http.proxy=$HTTP_PROXY_URL -c https.proxy=$HTTPS_PROXY_URL -C $DIR pull 2>&1)
fi fi
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
report_error 1 "Unable to update git $DIR: $OUT" report_error log "Unable to update git $DIR: $OUT"
fi fi
new_git_hash="$(git -C $DIR rev-parse --verify HEAD)" new_git_hash="$(git -C $DIR rev-parse --verify HEAD)"