[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2320/8267] lib/oe/patch: handle non-UTF8 encoding when reading patches

[Emmanuele Bassi <ebassi src gnome org>]

commit 94aefd9a39c688f34cfb0c9ef003de74d754f0e4
Author: Paul Eggleton <paul eggleton linux intel com>
Date:   Wed Aug 31 15:28:46 2016 +1200

    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>

 meta/lib/oe/patch.py |   28 ++++++++++++++++++----------
 1 files changed, 18 insertions(+), 10 deletions(-)
---
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
index cad5015..05e0faa 100644
--- a/meta/lib/oe/patch.py
+++ b/meta/lib/oe/patch.py
@@ -415,16 +415,24 @@ class GitApplyTree(PatchTree):
             out = runcmd(["sh", "-c", " ".join(shellcmd)], tree)
             if out:
                 for srcfile in out.split():
-                    patchlines = []
-                    outfile = None
-                    with open(srcfile, 'r') as f:
-                        for line in f:
-                            if line.startswith(GitApplyTree.patch_line_prefix):
-                                outfile = line.split()[-1].strip()
-                                continue
-                            if line.startswith(GitApplyTree.ignore_commit_prefix):
-                                continue
-                            patchlines.append(line)
+                    for encoding in ['utf-8', 'latin-1']:
+                        patchlines = []
+                        outfile = None
+                        try:
+                            with open(srcfile, 'r', encoding=encoding) as f:
+                                for line in f:
+                                    if line.startswith(GitApplyTree.patch_line_prefix):
+                                        outfile = line.split()[-1].strip()
+                                        continue
+                                    if line.startswith(GitApplyTree.ignore_commit_prefix):
+                                        continue
+                                    patchlines.append(line)
+                        except UnicodeDecodeError:
+                            continue
+                        break
+                    else:
+                        raise PatchError('Unable to find a character encoding to decode %s' % srcfile)
+
                     if not outfile:
                         outfile = os.path.basename(srcfile)
                     with open(os.path.join(outdir, outfile), 'w') as of: