From 5f318c5a444ef05bdf79b1f7640294c7423fd10e Mon Sep 17 00:00:00 2001 From: Lyndon Brown Date: Sat, 2 May 2020 13:05:03 +0100 Subject: tidy up Echo_breakage() - it's only used by the debootstrap script after alternatives were dropped long ago, so let's move it, avoiding it being loaded for everything else. - there's no need to pass printing another message through it. - there's little point in making the sid distinction if you happen to decide to build sid, it's a given that it's less stable than stable. really, is there any need for this at all? Gbp-Dch: Ignore --- scripts/build/bootstrap_debootstrap | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/build/bootstrap_debootstrap b/scripts/build/bootstrap_debootstrap index fe61451ba..5373fcc53 100755 --- a/scripts/build/bootstrap_debootstrap +++ b/scripts/build/bootstrap_debootstrap @@ -42,6 +42,11 @@ Check_stagefile "bootstrap_cache.restore" # Acquire lock file Acquire_lockfile +Print_breakage () +{ + Echo_message "If the following stage fails, the most likely cause of the problem is with your mirror configuration or a caching proxy." +} + # Creating chroot directory mkdir -p chroot @@ -79,7 +84,8 @@ then cp cache/packages.bootstrap/*.deb chroot/var/cache/apt/archives fi - Echo_breakage "Running debootstrap (download-only)... " + Print_breakage + Echo_message "Running debootstrap (download-only)..." debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LB_PARENT_DISTRIBUTION_CHROOT}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}" ${DEBOOTSTRAP_SCRIPT} # Removing old cache @@ -90,7 +96,8 @@ then cp chroot/var/cache/apt/archives/*.deb cache/packages.bootstrap fi -Echo_breakage "Running debootstrap... " +Print_breakage +Echo_message "Running debootstrap..." # Run appropriate bootstrap, i.e. foreign or regular bootstrap if [ "${LB_BOOTSTRAP_QEMU_ARCHITECTURE}" = "${LB_ARCHITECTURE}" ]; then -- cgit v1.2.3