Repository: oozie Updated Branches: refs/heads/master 44231370a -> a5c559cb1
OOZIE-2532 patch apply does not handle binary files (gezapeti via rkanter) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/a5c559cb Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/a5c559cb Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/a5c559cb Branch: refs/heads/master Commit: a5c559cb1f87cabbfaebb3af0abf54ed5d83b291 Parents: 4423137 Author: Robert Kanter <[email protected]> Authored: Tue May 24 19:35:20 2016 -0700 Committer: Robert Kanter <[email protected]> Committed: Tue May 24 19:35:20 2016 -0700 ---------------------------------------------------------------------- bin/test-patch | 40 ++++++++++++++++++++++++++-------------- release-log.txt | 1 + 2 files changed, 27 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/a5c559cb/bin/test-patch ---------------------------------------------------------------------- diff --git a/bin/test-patch b/bin/test-patch index d789e58..97f759c 100755 --- a/bin/test-patch +++ b/bin/test-patch @@ -271,21 +271,33 @@ downloadPatch () { applyPatch() { echo "Applying patch" >> $STDOUT echo "" >> $STDOUT - patch -f -E --dry-run -p0 < ${PATCHFILE} | tee ${REPORTDIR}/APPLY-PATCH.txt \ + git apply --check -v -p0 < ${PATCHFILE} | tee ${REPORTDIR}/APPLY-PATCH.txt \ >> $STDOUT - if [[ ${PIPESTATUS[0]} != 0 ]] ; then - echo "Patch failed to apply to head of branch" - echo "{color:red}-1{color} Patch failed to apply to head of branch" >> ${SUMMARYFILE} - echo "" >> ${SUMMARYFILE} - echo "----------------------------" >> ${SUMMARYFILE} - echo - cleanupAndExit 1 - fi - patch -f -E -p0 < ${PATCHFILE} > ${REPORTDIR}/APPLY-PATCH.txt - if [[ $? != 0 ]] ; then - echo "ODD!, dry run passed, but patch failed to apply to head of branch" - echo - cleanupAndExit 1 + if [[ ${PIPESTATUS[0]} == 0 ]] ; then + git apply -v -p0 < ${PATCHFILE} > ${REPORTDIR}/APPLY-PATCH.txt + if [[ $? != 0 ]] ; then + echo "ODD!, git apply --check -p0 passed, but patch failed to apply to head of branch" + echo + cleanupAndExit 1 + fi + else + git apply --check -v < ${PATCHFILE} | tee ${REPORTDIR}/APPLY-PATCH.txt \ + >> $STDOUT + if [[ ${PIPESTATUS[0]} == 0 ]] ; then + git apply -v < ${PATCHFILE} > ${REPORTDIR}/APPLY-PATCH.txt + if [[ $? != 0 ]] ; then + echo "ODD!, git apply --check passed, but patch failed to apply to head of branch" + echo + cleanupAndExit 1 + fi + else + echo "Patch failed to apply to head of branch" + echo "{color:red}-1{color} Patch failed to apply to head of branch" >> ${SUMMARYFILE} + echo "" >> ${SUMMARYFILE} + echo "----------------------------" >> ${SUMMARYFILE} + echo + cleanupAndExit 1 + fi fi echo "" >> $STDOUT echo "Patch applied" http://git-wip-us.apache.org/repos/asf/oozie/blob/a5c559cb/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 1170711..ebd13ae 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.3.0 release (trunk - unreleased) +OOZIE-2532 patch apply does not handle binary files (gezapeti via rkanter) OOZIE-2330 Spark action should take the global jobTracker and nameNode configs by default and allow file and archive elements (satishsaley via rkanter) OOZIE-2510 TestLogStreamer.testStreamLog() fails in other timezones (pbacsko via rkanter) OOZIE-2531 Prevent Spark trying for token which is already available (satishsaley via rkanter)
