diff options
Diffstat (limited to 'support/scripts/apply-patches.sh')
| -rwxr-xr-x | support/scripts/apply-patches.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh index 694302d33e..7ccb39dd8f 100755 --- a/support/scripts/apply-patches.sh +++ b/support/scripts/apply-patches.sh @@ -31,6 +31,8 @@ # applied. The list of the patches applied is stored in '.applied_patches_list' # file in the build directory. +set -e + silent= if [ "$1" = "-s" ] ; then # add option to be used by the patch tool @@ -103,7 +105,7 @@ function apply_patch { echo "Error: missing patch file ${path}/$patch" exit 1 fi - existing="$(grep -E "/${patch}\$" ${builddir}/.applied_patches_list)" + existing="$(grep -E "/${patch}\$" ${builddir}/.applied_patches_list || true)" if [ -n "${existing}" ]; then echo "Error: duplicate filename '${patch}'" echo "Conflicting files are:" |
