[U-Boot] [PATCH 1/2] buildman: Allow conflicting tags to avoid spurious errors

[Tom Rini]

On Thu, May 02, 2013 at 05:46:02PM -0700, Simon Glass wrote:

> 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.
> 
> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
>  tools/buildman/control.py | 5 +++++
>  tools/patman/series.py    | 4 +++-
>  2 files changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/tools/buildman/control.py b/tools/buildman/control.py
> index 8d7b9b5..1ce8b6f 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
> +    # then. For example, Series-version is not useful for buildman. On the

s/then/them/

Feel free to fix in-line and pull request.

Reviewed-by: Tom Rini <trini at ti.com>

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130503/ea58d53c/attachment.pgp>