From 28aeda558b49978ecd8ab38b4ff6bca4a38d6caf Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Wed, 19 Feb 2020 13:20:00 +0100 Subject: [PATCH] appveyor: use decode() on git hashes --- appveyor/do.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor/do.py b/appveyor/do.py index 821a4ab..d0a9064 100644 --- a/appveyor/do.py +++ b/appveyor/do.py @@ -186,7 +186,7 @@ def add_dependency(dep, tag): bfile.close() else: checked_out = 'never' - head = sp.check_output(['cd {0}; git log -n1 --pretty=format:%H'.format(place)], shell=True) + head = sp.check_output(['cd {0}; git log -n1 --pretty=format:%H'.format(place)], shell=True).decode() logger.debug('Found checked_out commit %s, git head is %s', checked_out, head) if head != checked_out: logger.debug('Dependency %s out of date - removing', dep) @@ -226,7 +226,7 @@ def add_dependency(dep, tag): sp.check_call(hook, shell=True) # write checked out commit hash to marker file - head = sp.check_output(['cd {0}; git log -n1 --pretty=format:%H'.format(place)], shell=True) + head = sp.check_output(['cd {0}; git log -n1 --pretty=format:%H'.format(place)], shell=True).decode() logger.debug('Writing hash of checked-out dependency (%s) to marker file', head) with open(checked_file, "w") as fout: print(head, file=fout)