Repository: kudu Updated Branches: refs/heads/master c8724c615 -> 97e1cbfc9
Fix python build script print newlines This is a fixup for 112869cf22c47543. Change-Id: I36fb45f3045dea3d16689db730d2372d4cf4a936 Reviewed-on: http://gerrit.cloudera.org:8080/9520 Reviewed-by: Adar Dembo <a...@cloudera.com> Tested-by: Kudu Jenkins Project: http://git-wip-us.apache.org/repos/asf/kudu/repo Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/97e1cbfc Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/97e1cbfc Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/97e1cbfc Branch: refs/heads/master Commit: 97e1cbfc92b710d4ef9dfb3ed559b175073982b3 Parents: c8724c6 Author: Dan Burkert <d...@danburkert.com> Authored: Tue Mar 6 15:31:45 2018 -0800 Committer: Dan Burkert <danburk...@apache.org> Committed: Wed Mar 7 01:09:28 2018 +0000 ---------------------------------------------------------------------- build-support/build_source_release.py | 4 +++- build-support/kudu_util.py | 4 +++- build-support/push_to_asf.py | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kudu/blob/97e1cbfc/build-support/build_source_release.py ---------------------------------------------------------------------- diff --git a/build-support/build_source_release.py b/build-support/build_source_release.py index 3006a68..cc29d23 100755 --- a/build-support/build_source_release.py +++ b/build-support/build_source_release.py @@ -17,6 +17,8 @@ # specific language governing permissions and limitations # under the License. +from __future__ import print_function + import hashlib import logging import os @@ -91,7 +93,7 @@ def sign_tarball(tarball_path): if not email.endswith("@apache.org"): print(Colors.YELLOW, "Your email address for the repository is not an @apache.org address.") print("Release signatures should typically be signed by committers with @apache.org GPG keys.") - print(Colors.RESET) + print(end=Colors.RESET) if not confirm_prompt("Continue?"): return http://git-wip-us.apache.org/repos/asf/kudu/blob/97e1cbfc/build-support/kudu_util.py ---------------------------------------------------------------------- diff --git a/build-support/kudu_util.py b/build-support/kudu_util.py index da4dbe6..284042c 100644 --- a/build-support/kudu_util.py +++ b/build-support/kudu_util.py @@ -20,6 +20,8 @@ # This script generates a header file which contains definitions # for the current Kudu build (eg timestamp, git hash, etc) +from __future__ import print_function + import os import subprocess import sys @@ -69,7 +71,7 @@ def confirm_prompt(prompt): if the user confirms. """ while True: - print(prompt + "[Y/n]:"), + print(prompt, end=' [Y/n]: ') if not os.isatty(sys.stdout.fileno()): print("Not running interactively. Assuming 'N'.") http://git-wip-us.apache.org/repos/asf/kudu/blob/97e1cbfc/build-support/push_to_asf.py ---------------------------------------------------------------------- diff --git a/build-support/push_to_asf.py b/build-support/push_to_asf.py index d88ca7d..5b4d15f 100755 --- a/build-support/push_to_asf.py +++ b/build-support/push_to_asf.py @@ -223,7 +223,7 @@ def main(): apache_branches = get_branches('apache') for branch, apache_sha in sorted(apache_branches.items()): gerrit_sha = rev_parse("remotes/gerrit/" + branch) - print("Branch '%s':\t" % branch) + print("Branch '%s':" % branch, end='\t') if gerrit_sha is None: print(Colors.YELLOW, "found on Apache but not in gerrit", Colors.RESET) continue
