aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Bo ├śrsted Andresen <bo.andresen@zlin.dk> 2008-04-13 17:20:46 +0000
committerAvatar Bo ├śrsted Andresen <bo.andresen@zlin.dk> 2008-04-13 17:20:46 +0000
commit7168420fc5eb1844744ab233952f7f71e057b346 (patch)
tree6a244cb983bdc636cac963e4e936ebb23a0344a1
parent2bd98ca1ec0962e7ca677fd32b6a8aec89c111e2 (diff)
downloadpaludis-7168420fc5eb1844744ab233952f7f71e057b346.tar.gz
paludis-7168420fc5eb1844744ab233952f7f71e057b346.tar.xz
Fix expatch error handling.
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/build_functions.bash6
1 files changed, 3 insertions, 3 deletions
diff --git a/paludis/repositories/e/ebuild/exheres-0/build_functions.bash b/paludis/repositories/e/ebuild/exheres-0/build_functions.bash
index 0e32ef1..e3d566b 100644
--- a/paludis/repositories/e/ebuild/exheres-0/build_functions.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/build_functions.bash
@@ -63,9 +63,9 @@ expatch()
;;
esac
- echo "${cmd} ${1} | patch -s ${patchlevel:--p1} ${options[@]}" 1>&2
- ${cmd} "${1}" | patch -s ${patchlevel:--p1} "${options[@]}" || \
- die "patch -s ${patchlevel:--p1} ${options[@]} ${1} failed"
+ echo "${cmd} ${1} | patch -s -f ${patchlevel:--p1} ${options[@]}" 1>&2
+ ${cmd} "${1}" | patch -s -f ${patchlevel:--p1} "${options[@]}"
+ assert "patch -s -f ${patchlevel:--p1} ${options[@]} ${1} failed"
fi
shift
done