diff options
| author | Simon Glass <sjg@chromium.org> | 2014-09-05 19:00:23 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2014-09-09 16:38:31 -0600 |
| commit | 950a23133d8235778ea29f5d9587edec7d9bbc0a (patch) | |
| tree | 5db30378cf951577c252f4c4b698d5f55381f488 /tools/patman | |
| parent | f7582ce8496f19edf845d1f62c4b7f385e4cd864 (diff) | |
| download | talos-obmc-uboot-950a23133d8235778ea29f5d9587edec7d9bbc0a.tar.gz talos-obmc-uboot-950a23133d8235778ea29f5d9587edec7d9bbc0a.zip | |
buildman: Ignore conflicting tags
Tags like Series-version are normally expected to appear once, and with a
unique value. But buildman doesn't actually look at these tags. So ignore
conflicts.
This allows bulidman to build a branch containing multiple patman series.
Reported-by: Steve Rae <srae@broadcom.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools/patman')
| -rw-r--r-- | tools/patman/patchstream.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py index b3e66c32a9..d630157f8f 100644 --- a/tools/patman/patchstream.py +++ b/tools/patman/patchstream.py @@ -355,7 +355,7 @@ class PatchStream: def GetMetaDataForList(commit_range, git_dir=None, count=None, - series = None): + series = None, allow_overwrite=False): """Reads out patch series metadata from the commits This does a 'git log' on the relevant commits and pulls out the tags we @@ -367,11 +367,13 @@ def GetMetaDataForList(commit_range, git_dir=None, count=None, count: Number of commits to list, or None for no limit series: Series object to add information into. By default a new series is started. + allow_overwrite: Allow tags to overwrite an existing tag Returns: A Series object containing information about the commits. """ if not series: series = Series() + series.allow_overwrite = allow_overwrite params = gitutil.LogCmd(commit_range,reverse=True, count=count, git_dir=git_dir) stdout = command.RunPipe([params], capture=True).stdout |
