[
https://issues.apache.org/jira/browse/OOZIE-2532?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Peter Cseh updated OOZIE-2532:
------------------------------
Attachment: OOZIE-2532-002.patch
Changed the script to accept patches with and without -p0
The output looks like this:
{quote}
Checking patch
a/core/src/main/java/org/apache/oozie/action/hadoop/SparkActionExecutor.java =>
b/core/src/main/java/org/apache/oozie/action/hadoop/SparkActionExecutor.java...
error:
a/core/src/main/java/org/apache/oozie/action/hadoop/SparkActionExecutor.java:
No such file or directory
Checking patch
core/src/main/java/org/apache/oozie/action/hadoop/SparkActionExecutor.java...
Checking patch
core/src/main/java/org/apache/oozie/action/hadoop/SparkActionExecutor.java...
Applied patch
core/src/main/java/org/apache/oozie/action/hadoop/SparkActionExecutor.java
cleanly.
{quote}
> patch apply does not handle binary files
> ----------------------------------------
>
> Key: OOZIE-2532
> URL: https://issues.apache.org/jira/browse/OOZIE-2532
> Project: Oozie
> Issue Type: Task
> Reporter: Peter Cseh
> Assignee: Peter Cseh
> Attachments: OOZIE-2532-001.patch, OOZIE-2532-002.patch
>
>
> In OOZIE-2482 there is a patch which contains binary files as well.
> After running
> {quote}patch -E -p0 <~/Downloads/OOZIE-2482-2.patch {quote}
> the folder sharelib/spark/src/test/resources contains only pi.py, and not the
> zip files.
> {quote}git apply -p0 <~/Downloads/OOZIE-2482-2.patch {quote}
> processes the binary part of the patch as well.
> Git documentation claims that patches created with --binary can be applied
> with git apply, I assume they know that it's not compatible with the patch
> command.
> Should we change this in the Jenkins job or we should keep this behavior as a
> gatekeeper to prevent binary files committed to master?
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
