summaryrefslogtreecommitdiffstats
path: root/scripts/combo-layer
diff options
context:
space:
mode:
authorOlaf Mandel <o.mandel@menlosystems.com>2016-10-17 08:16:27 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-10-28 16:15:18 +0100
commit050b8969ab5933a071f5d047cea7ab730a2753cf (patch)
tree25a342a45c777c0aee1f72f0abbf56006aad6844 /scripts/combo-layer
parent7e5b59d7af6923e082cb34d6ac91742204e90137 (diff)
downloadpoky-050b8969ab5933a071f5d047cea7ab730a2753cf.tar.gz
combo-layer: fix crashes on wrong tempfile usage
When calling tempfile.NamedTemporaryFile().write(str()), at least on Python 3.4.2 this fails with this error: TypeError: 'str' does not support the buffer interface Change the file-mode for all such files from binary to text mode. (From OE-Core rev: d08f3882a35eec8a042d2501715684444e353605) Signed-off-by: Olaf Mandel <o.mandel@menlosystems.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/combo-layer')
-rwxr-xr-xscripts/combo-layer6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer
index b90bfc8800..4a210fba63 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -329,7 +329,7 @@ def action_init(conf, args):
329 # one. The commit should be in both repos with 329 # one. The commit should be in both repos with
330 # the same tree, but better check here. 330 # the same tree, but better check here.
331 tree = runcmd('git show -s --pretty=format:%%T %s' % rev).strip() 331 tree = runcmd('git show -s --pretty=format:%%T %s' % rev).strip()
332 with tempfile.NamedTemporaryFile() as editor: 332 with tempfile.NamedTemporaryFile(mode='wt') as editor:
333 editor.write('''cat >$1 <<EOF 333 editor.write('''cat >$1 <<EOF
334tree %s 334tree %s
335author %s 335author %s
@@ -353,7 +353,7 @@ EOF
353 # Optional: rewrite history to change commit messages or to move files. 353 # Optional: rewrite history to change commit messages or to move files.
354 if 'hook' in repo or dest_dir != ".": 354 if 'hook' in repo or dest_dir != ".":
355 filter_branch = ['git', 'filter-branch', '--force'] 355 filter_branch = ['git', 'filter-branch', '--force']
356 with tempfile.NamedTemporaryFile() as hookwrapper: 356 with tempfile.NamedTemporaryFile(mode='wt') as hookwrapper:
357 if 'hook' in repo: 357 if 'hook' in repo:
358 # Create a shell script wrapper around the original hook that 358 # Create a shell script wrapper around the original hook that
359 # can be used by git filter-branch. Hook may or may not have 359 # can be used by git filter-branch. Hook may or may not have
@@ -1137,7 +1137,7 @@ def update_with_history(conf, components, revisions, repos):
1137 if hook: 1137 if hook:
1138 # Need to turn the verbatim commit message into something resembling a patch header 1138 # Need to turn the verbatim commit message into something resembling a patch header
1139 # for the hook. 1139 # for the hook.
1140 with tempfile.NamedTemporaryFile(delete=False) as patch: 1140 with tempfile.NamedTemporaryFile(mode='wt', delete=False) as patch:
1141 patch.write('Subject: [PATCH] ') 1141 patch.write('Subject: [PATCH] ')
1142 patch.write(body) 1142 patch.write(body)
1143 patch.write('\n---\n') 1143 patch.write('\n---\n')