Commit 5871b791 authored by Arnout Vandecappelle's avatar Arnout Vandecappelle Committed by Peter Korsgaard
Browse files

apply-patches: run patch in batch mode 



If the file to be patched is missing, then `patch' will interactively
ask for a file to be patched. This is annoying in e.g. the autobuilders
because they have to wait for a timeout instead of failing.

Giving the '-t' (batch mode) option to patch fixes this: it will skip the
missing file, and return a non-zero exit code. So the build cleanly
fails.

Signed-off-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: default avatarLuca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent f627ebeb

support/scripts/apply-patches.sh

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ function apply_patch { 
    echo ""

    echo "Applying $patch using ${type}: "

	echo $patch >> ${builddir}/.applied_patches_list

    ${uncomp} "${path}/$patch" | patch -g0 -p1 -E -d "${builddir}"

    ${uncomp} "${path}/$patch" | patch -g0 -p1 -E -d "${builddir}" -t

    if [ $? != 0 ] ; then

        echo "Patch failed!  Please fix ${patch}!"

	exit 1