summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oe/patch.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
index bb1c40aa1e..7ca2e28b1f 100644
--- a/meta/lib/oe/patch.py
+++ b/meta/lib/oe/patch.py
@@ -439,7 +439,6 @@ class GitApplyTree(PatchTree):
439 def extractPatches(tree, startcommit, outdir, paths=None): 439 def extractPatches(tree, startcommit, outdir, paths=None):
440 import tempfile 440 import tempfile
441 import shutil 441 import shutil
442 import re
443 tempdir = tempfile.mkdtemp(prefix='oepatch') 442 tempdir = tempfile.mkdtemp(prefix='oepatch')
444 try: 443 try:
445 shellcmd = ["git", "format-patch", "--no-signature", "--no-numbered", startcommit, "-o", tempdir] 444 shellcmd = ["git", "format-patch", "--no-signature", "--no-numbered", startcommit, "-o", tempdir]
@@ -455,13 +454,10 @@ class GitApplyTree(PatchTree):
455 try: 454 try:
456 with open(srcfile, 'r', encoding=encoding) as f: 455 with open(srcfile, 'r', encoding=encoding) as f:
457 for line in f: 456 for line in f:
458 checkline = line 457 if line.startswith(GitApplyTree.patch_line_prefix):
459 if checkline.startswith('Subject: '):
460 checkline = re.sub(r'\[.+?\]\s*', '', checkline[9:])
461 if checkline.startswith(GitApplyTree.patch_line_prefix):
462 outfile = line.split()[-1].strip() 458 outfile = line.split()[-1].strip()
463 continue 459 continue
464 if checkline.startswith(GitApplyTree.ignore_commit_prefix): 460 if line.startswith(GitApplyTree.ignore_commit_prefix):
465 continue 461 continue
466 patchlines.append(line) 462 patchlines.append(line)
467 except UnicodeDecodeError: 463 except UnicodeDecodeError: