diff options
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/combo-layer | 6 |
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 |
334 | tree %s | 334 | tree %s |
335 | author %s | 335 | author %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') |