b70ce56651
Commit 54d3d94b6e ("support/download: print
command used for download") broke the git and svn download helpers, because
these helpers have invocations of the _git/_svn commands where the exact
output matters.
For example for git, this would result in:
date: invalid date ‘GIT_DIR=.../dl/libyuv/git/.git git log -1 --pretty=format:%ci \n2019-04-12 17:48:45 +0000’
Detected a corrupted git cache.
Removing it and starting afresh.
Fix by splitting the _git function in two: _git and _plain_git.
The former echoes the command, and then calls the latter.
Most invocations use _git as before, but those cases where the output should
not be disturbed, directly call _plain_git.
For symmetry, all download helpers are aligned, even though only the git and
svn helpers were broken.
Fixes: #13631
Fixes:
http://autobuild.buildroot.org/results/c2f/c2fcd4aa6660e3c2f9c6f85646ca7dfe0db56040/
Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
[yann.morin.1998@free.fr: add bug report and autobuild failure]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
71 lines
2.0 KiB
Bash
Executable File
71 lines
2.0 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
# We want to catch any unexpected failure, and exit immediately
|
|
set -e
|
|
|
|
# Download helper for cvs, to be called from the download wrapper script
|
|
#
|
|
# Options:
|
|
# -q Be quiet
|
|
# -o FILE Generate archive in FILE.
|
|
# -u URI Checkout from repository at URI.
|
|
# -c REV Use revision REV.
|
|
# -N RAWNAME Use rawname (aka module name) RAWNAME.
|
|
# -n NAME Use basename NAME.
|
|
#
|
|
# Environment:
|
|
# CVS : the cvs command to call
|
|
|
|
quiet=
|
|
while getopts "${BR_BACKEND_DL_GETOPTS}" OPT; do
|
|
case "${OPT}" in
|
|
q) quiet=-Q;;
|
|
o) output="${OPTARG}";;
|
|
u) uri="${OPTARG#*://}";;
|
|
c) rev="${OPTARG}";;
|
|
N) rawname="${OPTARG}";;
|
|
n) basename="${OPTARG}";;
|
|
:) printf "option '%s' expects a mandatory argument\n" "${OPTARG}"; exit 1;;
|
|
\?) printf "unknown option '%s'\n" "${OPTARG}" >&2; exit 1;;
|
|
esac
|
|
done
|
|
|
|
shift $((OPTIND-1)) # Get rid of our options
|
|
|
|
# Caller needs to single-quote its arguments to prevent them from
|
|
# being expanded a second time (in case there are spaces in them).
|
|
# If the CVS server is deadlocked, the client will never return (cfr.
|
|
# http://autobuild.buildroot.net/results/23d/23d1034b33d0354de15de2ec4a8ccd0603e8db78/build-end.log
|
|
# ). Since nobody sane will put large code bases in CVS, a timeout of
|
|
# 10 minutes should do the trick.
|
|
_cvs() {
|
|
if [ -z "${quiet}" ]; then
|
|
printf '%s ' timeout 10m ${CVS} "${@}"; printf '\n'
|
|
fi
|
|
_plain_cvs "$@"
|
|
}
|
|
# Note: please keep command below aligned with what is printed above
|
|
_plain_cvs() {
|
|
eval timeout 10m ${CVS} "${@}"
|
|
}
|
|
|
|
if [[ ${rev} =~ ^[0-9] ]]; then
|
|
# Date, because a tag or a branch cannot begin with a number
|
|
select="-D"
|
|
else
|
|
# Tag or branch
|
|
select="-r"
|
|
fi
|
|
|
|
# The absence of an initial : on ${uri} means access method undefined
|
|
if [[ ! "${uri}" =~ ^: ]]; then
|
|
# defaults to anonymous pserver
|
|
uri=":pserver:anonymous@${uri}"
|
|
fi
|
|
|
|
export TZ=UTC
|
|
_cvs ${quiet} -z3 -d"'${uri}'" \
|
|
co "${@}" -d "'${basename}'" ${select} "'${rev}'" -P "'${rawname}'"
|
|
|
|
tar czf "${output}" "${basename}"
|