mirrors/buildroot
0
0
Fork 0
mirror of https://git.busybox.net/buildroot.git synced 2024-11-28 16:03:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

support/apply-patches: re-instate set -e

Browse Source 
As reported by Sébastien Szymanski [1], the apply-patches script
doesn't stop if a tar command can't extract an archive.

Use "set -e" to exit immediately if a command return an error.

Be sure to ignore any expected error: when we check if a patch to be
applied has the same basename as an already applied patch, the grep
would fail when no such patch was already applied. We should not fail
in this case.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Sébastien Szymanski <sebastien.szymanski@armadeus.com>
Cc: Romain Naour <romain.naour@openwide.fr>
Reviewed-by: Romain Naour <romain.naour@gmail.com>
Tested-by: Romain Naour <romain.naour@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Yann E. MORIN 2016-07-05 19:36:03 +02:00 committed by Thomas Petazzoni
parent 7e23692ece
commit d5ae67b4f4
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
support/scripts/apply-patches.sh
View File

@ -31,6 +31,8 @@
# applied. The list of the patches applied is stored in '.applied_patches_list' # applied. The list of the patches applied is stored in '.applied_patches_list'
# file in the build directory. # file in the build directory.
set -e
silent= silent=
if [ "$1" = "-s" ] ; then if [ "$1" = "-s" ] ; then
# add option to be used by the patch tool # add option to be used by the patch tool
@ -103,7 +105,7 @@ function apply_patch {
echo "Error: missing patch file ${path}/$patch" echo "Error: missing patch file ${path}/$patch"
exit 1 exit 1
fi fi
existing="$(grep -E "/${patch}\$" ${builddir}/.applied_patches_list)" existing="$(grep -E "/${patch}\$" ${builddir}/.applied_patches_list || true)"
if [ -n "${existing}" ]; then if [ -n "${existing}" ]; then
echo "Error: duplicate filename '${patch}'" echo "Error: duplicate filename '${patch}'"
echo "Conflicting files are:" echo "Conflicting files are:"