summaryrefslogtreecommitdiff
path: root/tools/buildman
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2013-05-02 14:46:02 +0000
committerSimon Glass <sjg@chromium.org>2013-05-09 14:27:38 -0700
commitf0b739f15f3369273ea372eb29a2b841ad6d0ddd (patch)
treeabdf0eb70ad6db62e8d9cee8072e313dbf999664 /tools/buildman
parent4e779ad2e54e39d5343c8c83b4fc686a7bb16859 (diff)
downloadu-boot-imx-f0b739f15f3369273ea372eb29a2b841ad6d0ddd.zip
u-boot-imx-f0b739f15f3369273ea372eb29a2b841ad6d0ddd.tar.gz
u-boot-imx-f0b739f15f3369273ea372eb29a2b841ad6d0ddd.tar.bz2
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/buildman')
-rw-r--r--tools/buildman/control.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/buildman/control.py b/tools/buildman/control.py
index 8d7b9b5..3e5f56c 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)