diff options
| author | jnqnfe <jnqnfe@gmail.com> | 2015-01-06 03:10:43 +0000 |
|---|---|---|
| committer | Luca Boccassi <bluca@debian.org> | 2020-03-05 21:04:22 +0000 |
| commit | a45dcf46f6ccb0c1d7e6788d891941ae0c136a9f (patch) | |
| tree | 161bcf177d5c08da9f57b3611e6429c856703163 | |
| parent | a67e01638fa3834fcfeb01baff2eedc88d4181ab (diff) | |
| download | vyos-live-build-a45dcf46f6ccb0c1d7e6788d891941ae0c136a9f.tar.gz vyos-live-build-a45dcf46f6ccb0c1d7e6788d891941ae0c136a9f.zip | |
fix missing use of echo helpers
Closes: #952876
| -rwxr-xr-x | functions/packagelists.sh | 6 | ||||
| -rwxr-xr-x | scripts/build/bootstrap_debootstrap | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/functions/packagelists.sh b/functions/packagelists.sh index 444cf07d5..b238e980e 100755 --- a/functions/packagelists.sh +++ b/functions/packagelists.sh @@ -33,7 +33,7 @@ Expand_packagelist () if [ -z "${_LB_LIST_LOCATION}" ] then - echo "W: Unknown package list '${_LB_LIST_NAME}'" >&2 + Echo_warning "Unknown package list '${_LB_LIST_NAME}'" continue fi @@ -57,7 +57,7 @@ Expand_packagelist () \#if\ *) if [ ${_LB_NESTED} -eq 1 ] then - echo "E: Nesting conditionals is not supported" >&2 + Echo_error "Nesting conditionals is not supported" exit 1 fi _LB_NESTED=1 @@ -81,7 +81,7 @@ Expand_packagelist () \#nif\ *) if [ ${_LB_NESTED} -eq 1 ] then - echo "E: Nesting conditionals is not supported" >&2 + Echo_error "Nesting conditionals is not supported" exit 1 fi _LB_NESTED=1 diff --git a/scripts/build/bootstrap_debootstrap b/scripts/build/bootstrap_debootstrap index 685700240..b4008de8a 100755 --- a/scripts/build/bootstrap_debootstrap +++ b/scripts/build/bootstrap_debootstrap @@ -26,9 +26,9 @@ Set_defaults if [ ! -x "$(which debootstrap 2>/dev/null)" ] then - echo "E: debootstrap - command not found" - echo "I: debootstrap can be obtained from http://ftp.debian.org/debian/pool/main/d/debootstrap/" - echo "I: On Debian based systems, debootstrap can be installed with 'apt-get install debootstrap'." + Echo_error "debootstrap - command not found" + Echo_verbose "debootstrap can be obtained from http://ftp.debian.org/debian/pool/main/d/debootstrap/" + Echo_verbose "On Debian based systems, debootstrap can be installed with 'apt-get install debootstrap'." exit 1 fi |