fix(git-tools): issue-view shows comment bodies and names the real tea failure (#1357) (#1365)
ci/woodpecker/push/publish Pipeline was successful
ci/woodpecker/push/publish Pipeline was successful
Co-authored-by: fred <[email protected]>
This commit was merged in pull request #1365.
This commit is contained in:
@@ -463,6 +463,34 @@ if [[ "$override_explicit" != "mosaicstack" ]]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Branch 6 (#1357 S1): with tea ABSENT from PATH, the override path must say tea is
|
||||
# missing, not "no tea login named X exists" (a cause that was never checked) and
|
||||
# not the seat-logins.sh advice, which cannot be followed without tea.
|
||||
NOTEA_BIN="$WORK_DIR/notea-bin"; mkdir -p "$NOTEA_BIN"
|
||||
for t in bash git python3 sed grep cat mktemp dirname basename readlink env sort head tr cut; do
|
||||
_p="$(command -v "$t" 2>/dev/null || true)"; [[ -n "$_p" ]] && ln -sf "$_p" "$NOTEA_BIN/$t"
|
||||
done
|
||||
override_notea_rc=0
|
||||
override_notea_err=$(cd "$REPO_DIR" && env -u GITEA_LOGIN \
|
||||
PATH="$NOTEA_BIN" HOME="$HOME_DIR" MOSAIC_GIT_IDENTITY=testseat \
|
||||
bash -c '
|
||||
command -v tea >/dev/null 2>&1 && { echo "SETUP: tea still on PATH"; exit 99; }
|
||||
source "'"$SCRIPT_DIR"'/detect-platform.sh"
|
||||
get_gitea_login_for_repo_override mosaicstack/stack
|
||||
' 2>&1 >/dev/null) || override_notea_rc=$?
|
||||
if [[ "$override_notea_rc" != 1 ]]; then
|
||||
echo "Expected --repo override path to fail (rc=1) with tea absent; got rc=$override_notea_rc: $override_notea_err" >&2
|
||||
exit 1
|
||||
fi
|
||||
if ! grep -q 'tea is not installed' <<<"$override_notea_err"; then
|
||||
echo "Expected --repo override path to name tea as absent; got: $override_notea_err" >&2
|
||||
exit 1
|
||||
fi
|
||||
if grep -q 'has no tea login\|seat-logins.sh' <<<"$override_notea_err"; then
|
||||
echo "Override path diagnosed a missing LOGIN while tea itself is absent: $override_notea_err" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
git -C "$REPO_DIR" remote set-url origin https://git.uscllc.com/USC/uconnect.git
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user