diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-02-03 15:28:52 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-08 08:00:25 +0000 |
commit | 30a5c9edc64179545bcdc0e6b184fccdb9ac5948 (patch) | |
tree | 0f0377f3c947169e5986d74dda530d79a9f8c1f2 /meta/lib | |
parent | 617e2e9413384d0530fd1b89d7509bb7d44aae54 (diff) | |
download | poky-30a5c9edc64179545bcdc0e6b184fccdb9ac5948.tar.gz |
classes/license: tweak license format messages
Strictly speaking not all of these characters are operators, so reword
the message to describe them as separators. Also use the standard
"recipename: message" format.
(From OE-Core rev: 9e5da3e83f2a5d43620e07a31728b7427329d8f4)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oe/license.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/lib/oe/license.py b/meta/lib/oe/license.py index 340da61102..31ca15b574 100644 --- a/meta/lib/oe/license.py +++ b/meta/lib/oe/license.py | |||
@@ -25,7 +25,8 @@ class InvalidLicense(LicenseError): | |||
25 | def __str__(self): | 25 | def __str__(self): |
26 | return "invalid characters in license '%s'" % self.license | 26 | return "invalid characters in license '%s'" % self.license |
27 | 27 | ||
28 | license_operator = re.compile('([&|() ])') | 28 | license_operator_chars = '&|() ' |
29 | license_operator = re.compile('([' + license_operator_chars + '])') | ||
29 | license_pattern = re.compile('[a-zA-Z0-9.+_\-]+$') | 30 | license_pattern = re.compile('[a-zA-Z0-9.+_\-]+$') |
30 | 31 | ||
31 | class LicenseVisitor(ast.NodeVisitor): | 32 | class LicenseVisitor(ast.NodeVisitor): |