diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-04-12 22:07:57 +0200 | 
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-04-12 22:07:57 +0200 | 
| commit | 18122019972ca639ee3b581257e3a63ff7c8efeb (patch) | |
| tree | 52f7223e7c63f43322f3eee4722743e12190a19f /tools/patman/commit.py | |
| parent | 90639feaa0d66a204f9d03a325ab14e2f97f6cbb (diff) | |
| parent | 785881f775252940185e10fbb2d5299c9ffa6bce (diff) | |
| download | olio-uboot-2014.01-18122019972ca639ee3b581257e3a63ff7c8efeb.tar.xz olio-uboot-2014.01-18122019972ca639ee3b581257e3a63ff7c8efeb.zip  | |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Conflicts:
	drivers/video/exynos_fb.c
Diffstat (limited to 'tools/patman/commit.py')
| -rw-r--r-- | tools/patman/commit.py | 7 | 
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/patman/commit.py b/tools/patman/commit.py index 7144e5414..468b50cc6 100644 --- a/tools/patman/commit.py +++ b/tools/patman/commit.py @@ -22,7 +22,7 @@  import re  # Separates a tag: at the beginning of the subject from the rest of it -re_subject_tag = re.compile('([^:]*):\s*(.*)') +re_subject_tag = re.compile('([^:\s]*):\s*(.*)')  class Commit:      """Holds information about a single commit/patch in the series. @@ -61,9 +61,10 @@ class Commit:          Subject tags look like this: -            propounder: Change the widget to propound correctly +            propounder: fort: Change the widget to propound correctly -        Multiple tags are supported. The list is updated in self.tag +        Here the tags are propounder and fort. Multiple tags are supported. +        The list is updated in self.tag.          Returns:              None if ok, else the name of a tag with no email alias  |