diff options
Diffstat (limited to 'tools/buildman/control.py')
| -rw-r--r-- | tools/buildman/control.py | 5 | 
1 files changed, 5 insertions, 0 deletions
| diff --git a/tools/buildman/control.py b/tools/buildman/control.py index 8d7b9b547..3e5f56c28 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) |