LineageOS/android_vendor_lineage
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

repopick: fix --check-picked on Python 3

Browse Source 
This is very subtly broken: we look for the string 'Change-Id:'
in an array of byte strings. Fix this by decoding the git output
to utf-8 strings.

Change-Id: I708ad0adacb61c89bfba0fd88eeb2e37648317af
This commit is contained in:
Simon Shields
2019-11-18 23:56:08 +11:00
parent 15d91cd200
commit d5e35c9dda
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build/tools/repopick.py
View File

@@ -392,7 +392,11 @@ if __name__ == '__main__':
for i in range(0, check_picked_count): for i in range(0, check_picked_count):
if subprocess.call(['git', 'cat-file', '-e', 'HEAD~{0}'.format(i)], cwd=project_path, stderr=open(os.devnull, 'wb')): if subprocess.call(['git', 'cat-file', '-e', 'HEAD~{0}'.format(i)], cwd=project_path, stderr=open(os.devnull, 'wb')):
continue continue
output = subprocess.check_output(['git', 'show', '-q', 'HEAD~{0}'.format(i)], cwd=project_path).split() output = subprocess.check_output(['git', 'show', '-q', 'HEAD~{0}'.format(i)], cwd=project_path)
# make sure we have a string on Python 3
if isinstance(output, bytes):
output = output.decode('utf-8')
output = output.split()
if 'Change-Id:' in output: if 'Change-Id:' in output:
head_change_id = '' head_change_id = ''
for j,t in enumerate(reversed(output)): for j,t in enumerate(reversed(output)):