diff options
| author | Tom Rini <trini@ti.com> | 2013-05-09 21:04:32 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-05-10 08:16:34 -0400 |
| commit | 2988eac70ead3720f9ec85a239cd06b2f7246683 (patch) | |
| tree | 19b692367ffb1d6df5423d616067ba4859739ea8 /tools/buildman/control.py | |
| parent | ecd7484b9b347f7a5ab33efdd53347f0a2030797 (diff) | |
| parent | e85707570cf44f7b2d1da5ae92af3684c72c28f2 (diff) | |
| download | olio-uboot-2014.01-2988eac70ead3720f9ec85a239cd06b2f7246683.tar.xz olio-uboot-2014.01-2988eac70ead3720f9ec85a239cd06b2f7246683.zip | |
Merge branch 'patman' of git://git.denx.de/u-boot-x86
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) |