summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2013-05-09 21:04:32 -0400
committerTom Rini <trini@ti.com>2013-05-10 08:16:34 -0400
commit2988eac70ead3720f9ec85a239cd06b2f7246683 (patch)
tree19b692367ffb1d6df5423d616067ba4859739ea8
parentecd7484b9b347f7a5ab33efdd53347f0a2030797 (diff)
parente85707570cf44f7b2d1da5ae92af3684c72c28f2 (diff)
downloadu-boot-imx-2988eac70ead3720f9ec85a239cd06b2f7246683.zip
u-boot-imx-2988eac70ead3720f9ec85a239cd06b2f7246683.tar.gz
u-boot-imx-2988eac70ead3720f9ec85a239cd06b2f7246683.tar.bz2
Merge branch 'patman' of git://git.denx.de/u-boot-x86
-rw-r--r--tools/buildman/control.py5
-rwxr-xr-xtools/patman/patman.py2
-rw-r--r--tools/patman/series.py4
3 files changed, 9 insertions, 2 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)
diff --git a/tools/patman/patman.py b/tools/patman/patman.py
index a8061a9..7a317c5 100755
--- a/tools/patman/patman.py
+++ b/tools/patman/patman.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
#
# Copyright (c) 2011 The Chromium OS Authors.
#
diff --git a/tools/patman/series.py b/tools/patman/series.py
index 783b3dd..85ed316 100644
--- a/tools/patman/series.py
+++ b/tools/patman/series.py
@@ -40,6 +40,7 @@ class Series(dict):
notes: List of lines in the notes
changes: (dict) List of changes for each version, The key is
the integer version number
+ allow_overwrite: Allow tags to overwrite an existing tag
"""
def __init__(self):
self.cc = []
@@ -49,6 +50,7 @@ class Series(dict):
self.cover = None
self.notes = []
self.changes = {}
+ self.allow_overwrite = False
# Written in MakeCcFile()
# key: name of patch file
@@ -72,7 +74,7 @@ class Series(dict):
"""
# If we already have it, then add to our list
name = name.replace('-', '_')
- if name in self:
+ if name in self and not self.allow_overwrite:
values = value.split(',')
values = [str.strip() for str in values]
if type(self[name]) != type([]):