summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-08-31 15:28:46 +1200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-08 00:36:48 +0100
commit94aefd9a39c688f34cfb0c9ef003de74d754f0e4 (patch)
tree66547285ac960c8b04132cc7a3953708a42d598b
parentead05456264e9c7c32819271562d0ac074ecaee3 (diff)
downloadpoky-94aefd9a39c688f34cfb0c9ef003de74d754f0e4.tar.gz
lib/oe/patch: handle non-UTF8 encoding when reading patches
When extracting patches from a git repository with PATCHTOOL = "git" we cannot assume that all patches will be UTF-8 formatted, so as with other places in this module, try latin-1 if utf-8 fails. This fixes UnicodeDecodeError running devtool update-recipe or devtool finish on the openssl recipe. (From OE-Core rev: 579e4d54a212d04cfece2c9fc0635d7ac1644058) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/patch.py28
1 files changed, 18 insertions, 10 deletions
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
index cad50157dd..05e0faa5b7 100644
--- a/meta/lib/oe/patch.py
+++ b/meta/lib/oe/patch.py
@@ -415,16 +415,24 @@ class GitApplyTree(PatchTree):
415 out = runcmd(["sh", "-c", " ".join(shellcmd)], tree) 415 out = runcmd(["sh", "-c", " ".join(shellcmd)], tree)
416 if out: 416 if out:
417 for srcfile in out.split(): 417 for srcfile in out.split():
418 patchlines = [] 418 for encoding in ['utf-8', 'latin-1']:
419 outfile = None 419 patchlines = []
420 with open(srcfile, 'r') as f: 420 outfile = None
421 for line in f: 421 try:
422 if line.startswith(GitApplyTree.patch_line_prefix): 422 with open(srcfile, 'r', encoding=encoding) as f:
423 outfile = line.split()[-1].strip() 423 for line in f:
424 continue 424 if line.startswith(GitApplyTree.patch_line_prefix):
425 if line.startswith(GitApplyTree.ignore_commit_prefix): 425 outfile = line.split()[-1].strip()
426 continue 426 continue
427 patchlines.append(line) 427 if line.startswith(GitApplyTree.ignore_commit_prefix):
428 continue
429 patchlines.append(line)
430 except UnicodeDecodeError:
431 continue
432 break
433 else:
434 raise PatchError('Unable to find a character encoding to decode %s' % srcfile)
435
428 if not outfile: 436 if not outfile:
429 outfile = os.path.basename(srcfile) 437 outfile = os.path.basename(srcfile)
430 with open(os.path.join(outdir, outfile), 'w') as of: 438 with open(os.path.join(outdir, outfile), 'w') as of: