summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2020-10-29 21:46:25 -0600
committerSimon Glass <sjg@chromium.org>2020-11-05 09:11:31 -0700
commitdffa42c3ef98a8f9bc26a221cdfc3fcfb9f0fa40 (patch)
treeba5b3d635f1f729fa4da83df43289153bbf8bb75 /tools
parent313ef5f897f15bc7ec2ca8054f4e4871a2f6be93 (diff)
patman: Convert 'Series-xxx' tag errors into warnings
If the Series-xxx tag is not recognised patman currently reports a fatal error. This is inconvenient if a new feature is later added to patman that an earlier version does not support. Report a warning instead, to allow the user to take action if needed, but still allow operation to proceed. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools')
-rw-r--r--tools/patman/patchstream.py4
-rw-r--r--tools/patman/series.py6
2 files changed, 8 insertions, 2 deletions
diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py
index 880d7ddc7f..24040d43d6 100644
--- a/tools/patman/patchstream.py
+++ b/tools/patman/patchstream.py
@@ -114,7 +114,9 @@ class PatchStream:
self.in_section = name
self.skip_blank = False
if self.is_log:
- self.series.AddTag(self.commit, line, name, value)
+ warn = self.series.AddTag(self.commit, line, name, value)
+ if warn:
+ self.commit.warn.append(warn)
def _add_to_commit(self, name):
"""Add a new Commit-xxx tag.
diff --git a/tools/patman/series.py b/tools/patman/series.py
index 393a44241b..4457719f2e 100644
--- a/tools/patman/series.py
+++ b/tools/patman/series.py
@@ -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