# ignite-456: fix git am 4
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/86a142ae Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/86a142ae Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/86a142ae Branch: refs/heads/ignite-456 Commit: 86a142aeb63f4d703d725ee7d6161697022ca753 Parents: 2388387 Author: Artem Shutak <[email protected]> Authored: Mon May 18 16:38:51 2015 +0300 Committer: Artem Shutak <[email protected]> Committed: Mon May 18 16:38:51 2015 +0300 ---------------------------------------------------------------------- dev-tools/src/main/groovy/jiraslurp.groovy | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86a142ae/dev-tools/src/main/groovy/jiraslurp.groovy ---------------------------------------------------------------------- diff --git a/dev-tools/src/main/groovy/jiraslurp.groovy b/dev-tools/src/main/groovy/jiraslurp.groovy index 3ff594c..cb75d9a 100644 --- a/dev-tools/src/main/groovy/jiraslurp.groovy +++ b/dev-tools/src/main/groovy/jiraslurp.groovy @@ -118,12 +118,14 @@ def applyPatch = { jira, attachementURL -> patchFile << new URL("$ATTACHMENT_URL/$attachementURL/").text try { - checkprocess "git am dev-tools/${patchFile.name}".execute(null, new File('incubator-ignite')) + checkprocess "git am ${patchFile.name}".execute() - println "Patch was applyed successfully." + println "Patch was applied successfully." } catch (Exception e) { - checkprocess "git am --abort".execute + println "Patch was not applied successfully. Aborting patch applying." + + checkprocess "git am --abort".execute() throw e; }
