kudu-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danburk...@apache.org
Subject kudu git commit: python3 support for push_to_asf.py
Date Mon, 05 Mar 2018 21:23:43 GMT
Repository: kudu
Updated Branches:
  refs/heads/master 3bfcbd8ad -> 1eb15683b


python3 support for push_to_asf.py

This is a fixup for 112869cf22c47543. I missed a few callers of
check_output.  check_output returns a byte string, but the callers
assumed a string.

Change-Id: I80ea273e6eb8556fa803b2da879537df4f343a11
Reviewed-on: http://gerrit.cloudera.org:8080/9498
Reviewed-by: Adar Dembo <adar@cloudera.com>
Tested-by: Dan Burkert <danburkert@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/1eb15683
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/1eb15683
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/1eb15683

Branch: refs/heads/master
Commit: 1eb15683b41e80f49ce7a51c9a9d222301d23723
Parents: 3bfcbd8
Author: Dan Burkert <danburkert@apache.org>
Authored: Mon Mar 5 12:34:58 2018 -0800
Committer: Dan Burkert <danburkert@apache.org>
Committed: Mon Mar 5 21:22:57 2018 +0000

----------------------------------------------------------------------
 build-support/gen_version_info.py | 4 ++--
 build-support/push_to_asf.py      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kudu/blob/1eb15683/build-support/gen_version_info.py
----------------------------------------------------------------------
diff --git a/build-support/gen_version_info.py b/build-support/gen_version_info.py
index c0cf6d1..d8aa88a 100755
--- a/build-support/gen_version_info.py
+++ b/build-support/gen_version_info.py
@@ -67,7 +67,7 @@ def main():
 
   output_path = args[0]
 
-  hostname = check_output(["hostname", "-f"]).strip()
+  hostname = check_output(["hostname", "-f"]).strip().decode('utf-8')
   build_time = "%s %s" % (strftime("%d %b %Y %H:%M:%S", localtime()), time.tzname[0])
   username = os.getenv("USER")
 
@@ -78,7 +78,7 @@ def main():
   else:
     try:
       # No command line git hash, find it in the local git repository.
-      git_hash = check_output(["git", "rev-parse", "HEAD"]).strip()
+      git_hash = check_output(["git", "rev-parse", "HEAD"]).strip().decode('utf-8')
       clean_repo = subprocess.call("git diff --quiet && git diff --cached --quiet",
shell=True) == 0
       clean_repo = str(clean_repo).lower()
     except Exception:

http://git-wip-us.apache.org/repos/asf/kudu/blob/1eb15683/build-support/push_to_asf.py
----------------------------------------------------------------------
diff --git a/build-support/push_to_asf.py b/build-support/push_to_asf.py
index 94e7cdb..d88ca7d 100755
--- a/build-support/push_to_asf.py
+++ b/build-support/push_to_asf.py
@@ -120,7 +120,7 @@ def rev_parse(rev):
 
 def rev_list(arg):
   """Run git rev-list, returning an array of SHA1 commit hashes."""
-  return check_output(['git', 'rev-list', arg]).splitlines()
+  return check_output(['git', 'rev-list', arg]).decode('utf-8').splitlines()
 
 
 def describe_commit(rev):


Mime
View raw message