diff options
author | Tom Rini <trini@konsulko.com> | 2020-11-06 11:27:14 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-11-06 11:27:14 -0500 |
commit | 22ad69b7987eb4b10221330661db4427e40174fb (patch) | |
tree | b13bc4ba708907cd76a0ec09c4599b55cb586953 /tools/patman/series.py | |
parent | 896cc5aa4a8fc0c28036b9615a37f0034addad44 (diff) | |
parent | dc4b2a9770b5b932cd6d98c33ebff6dc46de6849 (diff) |
Merge tag 'dm-pull5nov20' of git://git.denx.de/u-boot-dm
patman status subcommand to collect tags from Patchwork
patman showing email replies from Patchwork
sandbox poweroff command
minor fixes in binman, tests
Diffstat (limited to 'tools/patman/series.py')
-rw-r--r-- | tools/patman/series.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/patman/series.py b/tools/patman/series.py index 9f885c89873..4457719f2ef 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'] + 'cover_cc', 'process_log', 'links'] class Series(dict): """Holds information about a patch series, including all tags. @@ -59,6 +59,9 @@ class Series(dict): line: Source line containing tag (useful for debug/error messages) name: Tag name (part after 'Series-') value: Tag value (part after 'Series-xxx: ') + + Returns: + String warning if something went wrong, else None """ # If we already have it, then add to our list name = name.replace('-', '_') @@ -78,9 +81,10 @@ class Series(dict): else: self[name] = value else: - raise ValueError("In %s: line '%s': Unknown 'Series-%s': valid " + return ("In %s: line '%s': Unknown 'Series-%s': valid " "options are %s" % (commit.hash, line, name, ', '.join(valid_series))) + return None def AddCommit(self, commit): """Add a commit into our list of commits |