Skip to content

Commit 4137c84

Browse files
jiangxingitster
authored andcommitted
ci: remove the pipe after "p4 -V" to catch errors
When installing p4 as a dependency, we used to pipe output of "p4 -V" and "p4d -V" to validate the installation and output a condensed version information. But this would hide potential errors of p4 and would stop with an empty output. E.g.: p4d version 16.2 running on ubuntu 22.04 causes sigfaults, even before it produces any output. By removing the pipe after "p4 -V" and "p4d -V", we may get a verbose output, and stop immediately on errors because we have "set -e" in "ci/lib.sh". Since we won't look at these trace logs unless something fails, just including the raw output seems most sensible. Reviewed-by: Johannes Schindelin <[email protected]> Helped-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Jiang Xin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 0178420 commit 4137c84

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

ci/install-dependencies.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@ esac
8383
if type p4d >/dev/null 2>&1 && type p4 >/dev/null 2>&1
8484
then
8585
echo "$(tput setaf 6)Perforce Server Version$(tput sgr0)"
86-
p4d -V | grep Rev.
86+
p4d -V
8787
echo "$(tput setaf 6)Perforce Client Version$(tput sgr0)"
88-
p4 -V | grep Rev.
88+
p4 -V
8989
else
9090
echo >&2 "WARNING: perforce wasn't installed, see above for clues why"
9191
fi

0 commit comments

Comments
 (0)