altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 5 Packages Projects Releases Wiki Activity

Fixed a bytes/str issue in a patch library call.

Browse source 
- Legacy-Id: 16326
This commit is contained in:
Henrik Levkowetz 2019-06-28 20:47:36 +00:00
parent 92350834c7
commit 5e4146cb58
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ietf/checks.py
View file

@ -1,3 +1,4 @@
# Copyright The IETF Trust 2015-2019, All Rights Reserved
import os import os
import patch import patch
import sys import sys
@ -367,7 +368,7 @@ def maybe_patch_library(app_configs, **kwargs):
patch_path = os.path.join(cwd, patch_file) patch_path = os.path.join(cwd, patch_file)
patch_set = patch.fromfile(patch_path) patch_set = patch.fromfile(patch_path)
if patch_set: if patch_set:
if not patch_set.apply(root=library_path): if not patch_set.apply(root=library_path.encode('utf-8')):
errors.append(checks.Warning( errors.append(checks.Warning(
"Could not apply patch from file '%s'"%patch_file, "Could not apply patch from file '%s'"%patch_file,
hint=("Make sure that the patch file contains a unified diff and has valid file paths\n\n" hint=("Make sure that the patch file contains a unified diff and has valid file paths\n\n"