diff options
| author | Simon Glass <sjg@chromium.org> | 2013-05-02 14:46:02 +0000 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2013-05-09 14:27:38 -0700 |
| commit | f0b739f15f3369273ea372eb29a2b841ad6d0ddd (patch) | |
| tree | abdf0eb70ad6db62e8d9cee8072e313dbf999664 /tools | |
| parent | 4e779ad2e54e39d5343c8c83b4fc686a7bb16859 (diff) | |
buildman: Allow conflicting tags to avoid spurious errors
Conflicting tags can prevent buildman from building two series which exist
one after the other in a branch. There is no reason not to allow this sort
of workflow with buildman, so ignore conflicting tags in buildman.
Change-Id: I2231d04d8684fe0f8fe77f8ea107e5899a3da5e8
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/buildman/control.py | 5 | ||||
| -rw-r--r-- | tools/patman/series.py | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/tools/buildman/control.py b/tools/buildman/control.py index 8d7b9b54734..3e5f56c2802 100644 --- a/tools/buildman/control.py +++ b/tools/buildman/control.py @@ -137,6 +137,11 @@ def DoBuildman(options, args): upstream_commit = gitutil.GetUpstream(options.git_dir, options.branch) series = patchstream.GetMetaDataForList(upstream_commit, options.git_dir, 1) + # Conflicting tags are not a problem for buildman, since it does not use + # them. For example, Series-version is not useful for buildman. On the + # other hand conflicting tags will cause an error. So allow later tags + # to overwrite earlier ones. + series.allow_overwrite = True series = patchstream.GetMetaDataForList(range_expr, options.git_dir, None, series) diff --git a/tools/patman/series.py b/tools/patman/series.py index 783b3dd1338..85ed31688a1 100644 --- a/tools/patman/series.py +++ b/tools/patman/series.py @@ -40,6 +40,7 @@ class Series(dict): notes: List of lines in the notes changes: (dict) List of changes for each version, The key is the integer version number + allow_overwrite: Allow tags to overwrite an existing tag """ def __init__(self): self.cc = [] @@ -49,6 +50,7 @@ class Series(dict): self.cover = None self.notes = [] self.changes = {} + self.allow_overwrite = False # Written in MakeCcFile() # key: name of patch file @@ -72,7 +74,7 @@ class Series(dict): """ # If we already have it, then add to our list name = name.replace('-', '_') - if name in self: + if name in self and not self.allow_overwrite: values = value.split(',') values = [str.strip() for str in values] if type(self[name]) != type([]): |