diff options
| author |   Martin Jansa <martin.jansa@gmail.com> | 2020-11-01 00:45:32 +0100 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2020-11-02 04:27:35 -1000 |
| commit | bbd467c393af5fa34a0b92d5461ff0bf427b3933 (patch) | |
| tree | 490b29968bec5f7b53be691fd604ca9517944b8d /meta/lib | |
| parent | f4349c395749c30e70587fc276913530e518836b (diff) | |
| download | openembedded-core-contrib-bbd467c393af5fa34a0b92d5461ff0bf427b3933.tar.gz | |
lib/oe/patch: GitApplyTree: save 1 echo in commit-msg hook
* also remove the extra blank lines which is often added to patches
when refreshed with devtool (GitApplyTree.patch_line_prefix lines
are ignored when refreshing .patch files, but newly added blank
lines aren't - the leading blank line wasneeded for patches with
just the subject line (to prevent the GitApplyTree.patch_line_prefix
line ending appended to the commit summary), but we can add it
in prepareCommit instead
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta/lib')
| -rw-r--r-- | meta/lib/oe/patch.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index fa92abe248..bb1c40aa1e 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py @@ -508,8 +508,7 @@ class GitApplyTree(PatchTree): with open(commithook, 'w') as f: # NOTE: the formatting here is significant; if you change it you'll also need to # change other places which read it back - f.write('echo >> $1\n') - f.write('echo "%s: $PATCHFILE" >> $1\n' % GitApplyTree.patch_line_prefix) + f.write('echo "\n%s: $PATCHFILE" >> $1' % GitApplyTree.patch_line_prefix) os.chmod(commithook, 0o755) shutil.copy2(commithook, applyhook) try: |