diff options
| -rwxr-xr-x | functions/echo.sh | 14 | ||||
| -rwxr-xr-x | scripts/build/bootstrap_debootstrap | 11 |
2 files changed, 9 insertions, 16 deletions
diff --git a/functions/echo.sh b/functions/echo.sh index 48cf3cf8e..a46f036a6 100755 --- a/functions/echo.sh +++ b/functions/echo.sh @@ -88,17 +88,3 @@ Echo_file () echo "${1}: ${LINE}" >&3 done < "${1}" } - -Echo_breakage () -{ - case "${LB_PARENT_DISTRIBUTION_BINARY}" in - sid) - Echo_message "If the following stage fails, the most likely cause of the problem is with your mirror configuration, a caching proxy or the sid distribution." - ;; - *) - Echo_message "If the following stage fails, the most likely cause of the problem is with your mirror configuration or a caching proxy." - ;; - esac - - Echo_message "${@}" -} 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 |