manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix missing use of echo helpers 

Closes: #952876
This commit is contained in:
jnqnfe 2015-01-06 03:10:43 +00:00 committed by Luca Boccassi
parent a67e01638f
commit a45dcf46f6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
functions/packagelists.sh
View File

@ -33,7 +33,7 @@ Expand_packagelist ()
if [ -z "${_LB_LIST_LOCATION}" ] if [ -z "${_LB_LIST_LOCATION}" ]
then then
echo "W: Unknown package list '${_LB_LIST_NAME}'" >&2 Echo_warning "Unknown package list '${_LB_LIST_NAME}'"
continue continue
fi fi
@ -57,7 +57,7 @@ Expand_packagelist ()
\#if\ *) \#if\ *)
if [ ${_LB_NESTED} -eq 1 ] if [ ${_LB_NESTED} -eq 1 ]
then then
echo "E: Nesting conditionals is not supported" >&2 Echo_error "Nesting conditionals is not supported"
exit 1 exit 1
fi fi
_LB_NESTED=1 _LB_NESTED=1
@ -81,7 +81,7 @@ Expand_packagelist ()
\#nif\ *) \#nif\ *)
if [ ${_LB_NESTED} -eq 1 ] if [ ${_LB_NESTED} -eq 1 ]
then then
echo "E: Nesting conditionals is not supported" >&2 Echo_error "Nesting conditionals is not supported"
exit 1 exit 1
fi fi
_LB_NESTED=1 _LB_NESTED=1

6
scripts/build/bootstrap_debootstrap
View File

@ -26,9 +26,9 @@ Set_defaults
if [ ! -x "$(which debootstrap 2>/dev/null)" ] if [ ! -x "$(which debootstrap 2>/dev/null)" ]
then then
echo "E: debootstrap - command not found" Echo_error "debootstrap - command not found"
echo "I: debootstrap can be obtained from http://ftp.debian.org/debian/pool/main/d/debootstrap/" Echo_verbose "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_verbose "On Debian based systems, debootstrap can be installed with 'apt-get install debootstrap'."
exit 1 exit 1
fi fi