From ad8d81530da9a4f7c043ca2c3d7c9db34319e255 Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Wed, 13 Nov 2019 08:57:15 +0100 Subject: [PATCH] shell: git-update-and-verify-submodule: convert to python3 --- shell/bin/git-update-and-verify-submodule | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/shell/bin/git-update-and-verify-submodule b/shell/bin/git-update-and-verify-submodule index c4ba1f6..97159a4 100755 --- a/shell/bin/git-update-and-verify-submodule +++ b/shell/bin/git-update-and-verify-submodule @@ -1,6 +1,6 @@ -#!/usr/bin/python +#!/usr/bin/python3 -# Copyright (C) 2018 Simon Ruderich +# Copyright (C) 2018-2019 Simon Ruderich # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -27,13 +27,16 @@ repo_path = os.environ['OLDPWD'] submodule_path = os.getcwd() submodule = os.path.relpath(submodule_path, repo_path) -evtag = subprocess.check_output(['git-evtag-compute-py', sha1]).split('\n') +evtag = subprocess.check_output(['git-evtag-compute-py', sha1]) \ + .decode('ascii') \ + .split('\n') assert evtag[0].startswith('# git-evtag comment: ') assert evtag[1].startswith('Git-EVTag-v0-SHA512: ') os.chdir(repo_path) -log = subprocess.check_output(['git', 'log', '-1', '--', submodule]) +log = subprocess.check_output(['git', 'log', '-1', '--', submodule]) \ + .decode('ascii') found_comment = False found_evtag = False -- 2.43.2