fix branch and version list formatting in list-changes

Instead of relying on subprocess.call() to mix output with content
printed by Python, use check_output() and then explicitly include the
result in the print call.

Change-Id: I4f06d6cfaa8ea332d9326ccd8a5e69c749589529
Signed-off-by: Doug Hellmann <doug@doughellmann.com>
This commit is contained in:
Doug Hellmann
2017-03-15 18:37:31 -04:00
parent 5c0fa9a599
commit c9c0a0ece9

View File

@@ -63,11 +63,11 @@ def git_log(workdir, repo, title, git_range, extra_args=[]):
def git_list_existing_branches(workdir, repo):
header('All Branches with Version Numbers')
for branch in gitutils.get_branches(workdir, repo):
print('{:<30}'.format(branch), end=' ')
subprocess.call(
description = subprocess.check_output(
['git', 'describe', branch],
cwd=os.path.join(workdir, repo),
)
).decode('utf-8').strip()
print('{:<30} {}'.format(branch, description))
def git_branch_contains(workdir, repo, title, commit):