diff options
| author | Simon Glass <sjg@chromium.org> | 2013-03-26 13:09:42 +0000 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2013-04-08 15:09:03 -0700 |
| commit | a1318f7cdc2fcff3b30d39750dd07dbed8f03f21 (patch) | |
| tree | 675907d3a287ebbb8e604bb4ecfd4b4a4b9bf5cd /tools/patman/series.py | |
| parent | f140b5863b258120f5412ea86733f70c87837ee9 (diff) | |
| download | u-boot-a1318f7cdc2fcff3b30d39750dd07dbed8f03f21.tar.gz | |
patman: Provide option to ignore bad aliases
Often it happens that patches include tags which don't have aliases. It
is annoying that patman fails in this case, and provides no option to
continue other than adding empty tags to the .patman file.
Correct this by adding a '-t' option to ignore tags that don't exist.
Print a warning instead.
Since running the tests is not a common operation, move this to --test
instead, to reserve -t for this new option.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Doug Anderson <dianders@chromium.org>
Diffstat (limited to 'tools/patman/series.py')
| -rw-r--r-- | tools/patman/series.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tools/patman/series.py b/tools/patman/series.py index 44ad931cf8..eb5a00c37a 100644 --- a/tools/patman/series.py +++ b/tools/patman/series.py @@ -210,7 +210,7 @@ class Series(dict): str = 'Change log exists, but no version is set' print col.Color(col.RED, str) - def MakeCcFile(self, process_tags, cover_fname): + def MakeCcFile(self, process_tags, cover_fname, raise_on_error): """Make a cc file for us to use for per-commit Cc automation Also stores in self._generated_cc to make ShowActions() faster. @@ -218,6 +218,8 @@ class Series(dict): Args: process_tags: Process tags as if they were aliases cover_fname: If non-None the name of the cover letter. + raise_on_error: True to raise an error when an alias fails to match, + False to just print a message. Return: Filename of temp file created """ @@ -228,8 +230,10 @@ class Series(dict): for commit in self.commits: list = [] if process_tags: - list += gitutil.BuildEmailList(commit.tags) - list += gitutil.BuildEmailList(commit.cc_list) + list += gitutil.BuildEmailList(commit.tags, + raise_on_error=raise_on_error) + list += gitutil.BuildEmailList(commit.cc_list, + raise_on_error=raise_on_error) list += get_maintainer.GetMaintainer(commit.patch) all_ccs += list print >>fd, commit.patch, ', '.join(list) |