Repository: sqoop Updated Branches: refs/heads/sqoop2 e2e5aa8bf -> c3900910f
SQOOP-1858: Sqoop2: Print out warnings from git apply on output of precommit hook (Jarek Jarcec Cecho via Abraham Elmahrek) Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/c3900910 Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/c3900910 Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/c3900910 Branch: refs/heads/sqoop2 Commit: c3900910f8fd0e86913c3e55e8b59ff7acda2b3f Parents: e2e5aa8 Author: Abraham Elmahrek <[email protected]> Authored: Thu Dec 11 22:43:53 2014 -0600 Committer: Abraham Elmahrek <[email protected]> Committed: Thu Dec 11 22:43:53 2014 -0600 ---------------------------------------------------------------------- dev-support/test-patch.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/c3900910/dev-support/test-patch.py ---------------------------------------------------------------------- diff --git a/dev-support/test-patch.py b/dev-support/test-patch.py index e84ec2a..a98dce4 100755 --- a/dev-support/test-patch.py +++ b/dev-support/test-patch.py @@ -192,9 +192,10 @@ def git_apply(result, cmd, patch_file, strip, output_dir): with open(output_file) as fh: output = fh.read() if rc == 0: - result.success("Patch applied correctly") if output: - print output + result.success("Patch applied, but there has been warnings:\n{code}%s{code}\n" % (output)) + else: + result.success("Patch applied correctly") else: result.fatal("failed to apply patch (exit code %d):\n{code}%s{code}\n" % (rc, output))
