ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

importer: fix byte like objects

pull/12949/head
Martin Kojtal 2020-04-14 11:27:42 +01:00
parent 1b2a68ae20
commit 6d17a23421
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/importer/importer.py
View File

@ -200,7 +200,7 @@ def branch_exists(name):
cmd = ['git', 'branch'] cmd = ['git', 'branch']
_, output = run_cmd_with_output(cmd, exit_on_failure=False) _, output = run_cmd_with_output(cmd, exit_on_failure=False)
return name in output return name.encode('utf-8') in output
def branch_checkout(name): def branch_checkout(name):
@ -229,7 +229,7 @@ def get_last_cherry_pick_sha():
shas = re.findall( shas = re.findall(
pattern='^\s*\(cherry picked from commit ([0-9a-fA-F]+)\)$', pattern='^\s*\(cherry picked from commit ([0-9a-fA-F]+)\)$',
string=output, string=output.decode('utf-8'),
flags=re.MULTILINE flags=re.MULTILINE
) )
@ -274,7 +274,7 @@ def get_parser():
def main(): def main():
parser = get_parser() parser = get_parser()
args = parser.parse_args() args = parser.parse_args()
sha = get_curr_sha(args.repo_path) sha = get_curr_sha(args.repo_path).decode('utf-8')
repo_dir = os.path.basename(args.repo_path) repo_dir = os.path.basename(args.repo_path)
branch = 'feature_' + repo_dir + '_' + sha branch = 'feature_' + repo_dir + '_' + sha
commit_msg = "[" + repo_dir + "]" + ": Updated to " + sha commit_msg = "[" + repo_dir + "]" + ": Updated to " + sha