[PATCH v2 16/30] patman: Convert 'Series-xxx' tag errors into warnings
Simon Glass
sjg at chromium.org
Mon Oct 26 12:04:28 AEDT 2020
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 at chromium.org>
---
(no changes since v1)
tools/patman/patchstream.py | 4 +++-
tools/patman/series.py | 6 +++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py
index 880d7ddc7f2..24040d43d62 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 393a44241bd..4457719f2ef 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
--
2.29.0.rc2.309.g374f81d7ae-goog
More information about the Patchwork
mailing list