mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-09-20 04:56:21 +02:00
Merge branch 'maint-0.4.7'
This commit is contained in:
commit
7e055c383c
@ -371,7 +371,6 @@ if [[ "$RUN_STAGE_BUILD" = "yes" ]] ; then
|
||||
hooray "Distcheck was successful. Nothing further will be done."
|
||||
# We have to exit early here, since we can't do any other tests.
|
||||
cp tor-*.tar.gz "${CI_SRCDIR}"/artifacts
|
||||
exit 0
|
||||
else
|
||||
error "Diagnostics:"
|
||||
runcmd make show-distdir-testlog || true
|
||||
@ -379,6 +378,7 @@ if [[ "$RUN_STAGE_BUILD" = "yes" ]] ; then
|
||||
die "Unable to continue."
|
||||
fi
|
||||
end_section Distcheck
|
||||
exit 0
|
||||
fi
|
||||
fi
|
||||
|
||||
|
@ -160,11 +160,17 @@ if [[ $GITIDX = 1 ]]; then
|
||||
# partially staged.
|
||||
note "Stashing unstaged changes"
|
||||
git stash -q --keep-index
|
||||
# For some reasons, shellcheck is not seeing that we can call this
|
||||
# function from the trap below.
|
||||
# shellcheck disable=SC2317
|
||||
function restoregit() {
|
||||
note "Restoring git state"
|
||||
git stash pop -q
|
||||
}
|
||||
else
|
||||
# For some reasons, shellcheck is not seeing that we can call this
|
||||
# function from the trap below.
|
||||
# shellcheck disable=SC2317
|
||||
function restoregit() {
|
||||
true
|
||||
}
|
||||
|
@ -48,6 +48,9 @@ if "${TOR_BINARY}" --list-modules | grep -q "relay: no"; then
|
||||
fi
|
||||
|
||||
tmpdir=
|
||||
# For some reasons, shellcheck is not seeing that we can call this
|
||||
# function from the trap below.
|
||||
# shellcheck disable=SC2317
|
||||
clean () {
|
||||
if [ -n "$tmpdir" ] && [ -d "$tmpdir" ]; then
|
||||
rm -rf "$tmpdir"
|
||||
|
@ -46,6 +46,9 @@ if "${TOR_BINARY}" --list-modules | grep -q "relay: no"; then
|
||||
fi
|
||||
|
||||
tmpdir=
|
||||
# For some reasons, shellcheck is not seeing that we can call this
|
||||
# function from the trap below.
|
||||
# shellcheck disable=SC2317
|
||||
clean () {
|
||||
if [ -n "$tmpdir" ] && [ -d "$tmpdir" ]; then
|
||||
rm -rf "$tmpdir"
|
||||
|
Loading…
Reference in New Issue
Block a user