From c6428f44e38724991e4efa01c512876fbd13badc Mon Sep 17 00:00:00 2001 From: Raphaƫl Hertzog Date: Fri, 24 Apr 2020 17:02:15 +0200 Subject: Use correct variable name to detect removal step Due to this mistake, the helpers were not called in reverse order during the removal step. This lead to things like "apt update" failing because a broken /etc/resolv.conf has been restored before the call to "chroot_archives remove". Gbp-Dch: Ignore --- scripts/build/chroot_prep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build/chroot_prep b/scripts/build/chroot_prep index 8de0e4e29..f9ebdea5f 100755 --- a/scripts/build/chroot_prep +++ b/scripts/build/chroot_prep @@ -98,7 +98,7 @@ if In_list "archives" ${HELPERS} && [ ! -e .build/bootstrap ]; then Echo_warning "The 'archives' helper is selected, but the bootstrap stage has not completed." fi -if [ "${_ACTION}" = "remove" ]; then +if [ "${ACTION}" = "remove" ]; then HELPERS_REVERSED="" for HELPER in $HELPERS; do HELPERS_REVERSED="${HELPER}${HELPERS_REVERSED:+ $HELPERS_REVERSED}" -- cgit v1.2.3