diff options
| author | Tom Rini <trini@konsulko.com> | 2021-10-31 15:48:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-10-31 15:48:43 -0400 |
| commit | 360e392274e3bfeda3b7226d2cac7514774d0da1 (patch) | |
| tree | 2f3608441e5fbbd43a9f5e3e51926ed352a2e838 /tools/patman/series.py | |
| parent | 77680d8f85b94ffe690b8fe1f35767aef8b1415a (diff) | |
| parent | b55881ddb455af31b64038cf3b67f781909971cc (diff) | |
Merge tag 'dm-pull-boo21' of https://source.denx.de/u-boot/custodians/u-boot-dm
Environment tidy-ups
patman 'postfix' support
fix binman test race condition causing a timeout error
# gpg: Signature made Sun 31 Oct 2021 03:36:55 PM EDT
# gpg: using RSA key B25C0022AF86A7CC1655B6277F173A3E9008ADE6
# gpg: issuer "sjg@chromium.org"
# gpg: Good signature from "Simon Glass <sjg@chromium.org>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: B25C 0022 AF86 A7CC 1655 B627 7F17 3A3E 9008 ADE6
Diffstat (limited to 'tools/patman/series.py')
| -rw-r--r-- | tools/patman/series.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tools/patman/series.py b/tools/patman/series.py index 8ae218d3a4c..da734d92cf3 100644 --- a/tools/patman/series.py +++ b/tools/patman/series.py @@ -16,7 +16,7 @@ from patman import tools # Series-xxx tags that we understand valid_series = ['to', 'cc', 'version', 'changes', 'prefix', 'notes', 'name', - 'cover_cc', 'process_log', 'links', 'patchwork_url'] + 'cover_cc', 'process_log', 'links', 'patchwork_url', 'postfix'] class Series(dict): """Holds information about a patch series, including all tags. @@ -133,6 +133,7 @@ class Series(dict): print('Cc:\t ', item) print('Version: ', self.get('version')) print('Prefix:\t ', self.get('prefix')) + print('Postfix:\t ', self.get('postfix')) if self.cover: print('Cover: %d lines' % len(self.cover)) cover_cc = gitutil.BuildEmailList(self.get('cover_cc', '')) @@ -322,4 +323,8 @@ class Series(dict): prefix = '' if self.get('prefix'): prefix = '%s ' % self['prefix'] - return '%s%sPATCH%s' % (git_prefix, prefix, version) + + postfix = '' + if self.get('postfix'): + postfix = ' %s' % self['postfix'] + return '%s%sPATCH%s%s' % (git_prefix, prefix, postfix, version) |