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

- Legacy-Id: 16326
This commit is contained in:
Henrik Levkowetz 2019-06-28 20:47:36 +00:00
parent 92350834c7
commit 5e4146cb58

View file

@ -1,3 +1,4 @@
# Copyright The IETF Trust 2015-2019, All Rights Reserved
import os
import patch
import sys
@ -367,7 +368,7 @@ def maybe_patch_library(app_configs, **kwargs):
patch_path = os.path.join(cwd, patch_file)
patch_set = patch.fromfile(patch_path)
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(
"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"