diff options
| author |  Klaus Aehlig <aehlig@google.com> | 2018-06-13 05:48:18 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-06-13 05:49:23 -0700 |
| commit | ea21195ff0973c4bba0bda5887bb7c5fa5e7c5c2 (patch) | |
| tree | 5dfe93b2b0d6d97c4e5b4e780f0520c1de909edd /tools | |
| parent | 348225e4d25b9259489c1ed66eb7eca7612cddcc (diff) | |
Skylark repos: for failed patch command, also report stdout
The patch(1) utility usually gives error messages on stdout. So it is
not useful to report only stderr in case a patch failed. Report both.
Fixes #5379.
Change-Id: Ief198849e29ca989dfdefe2fadf495a0b0949972
PiperOrigin-RevId: 200377306
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/build_defs/repo/utils.bzl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/build_defs/repo/utils.bzl b/tools/build_defs/repo/utils.bzl index 4839b3e73b..e23556cce6 100644 --- a/tools/build_defs/repo/utils.bzl +++ b/tools/build_defs/repo/utils.bzl @@ -76,7 +76,8 @@ def patch(ctx): ) st = ctx.execute([bash_exe, "-c", command]) if st.return_code: - fail("Error applying patch %s:\n%s" % (str(patchfile), st.stderr)) + fail("Error applying patch %s:\n%s%s" % + (str(patchfile), st.stderr, st.stdout)) for cmd in ctx.attr.patch_cmds: st = ctx.execute([bash_exe, "-c", cmd]) if st.return_code: |