aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnders Roxell <anders.roxell@linaro.org>2015-01-05 23:12:49 +0100
committerAnders Roxell <anders.roxell@linaro.org>2015-01-05 23:12:49 +0100
commit2dad8c5c62b66c5f2edf4b98f94e85d724d4191a (patch)
tree7108188d83cf9a25efb15af08ebad7571fa18dab
parent7ea4c55dab7bb5774aa7561eb5847d578fbd5144 (diff)
apply-and-build: cat *-am*.log if failing
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
-rwxr-xr-xapply-and-build.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/apply-and-build.sh b/apply-and-build.sh
index 28a4ee2..08fcd2c 100755
--- a/apply-and-build.sh
+++ b/apply-and-build.sh
@@ -131,14 +131,14 @@ apply_patch() {
git am ${patch} >> ${logfile_basename}-am.log 2>&1
egrep "^Patch failed at" ${logfile_basename}-am.log > /dev/null
if [ $? -eq 0 ]; then
- rm -f ${logfile_basename}-am.log
+ cat ${logfile_basename}-am.log
git am --abort || exit 1
git checkout . || exit 1
git clean -xdf || exit 1
git am --3way ${patch} >> ${logfile_basename}-am-3way.log 2>&1
egrep "^Patch failed at" ${logfile_basename}-am-3way.log > /dev/null
if [ $? -eq 0 ]; then
- rm -f ${logfile_basename}-am.log
+ cat ${logfile_basename}-am-3way.log
echo " Error: Patch failed to apply"
git am --abort || exit 1
git checkout . || exit 1