29 lines
1.2 KiB
Diff
29 lines
1.2 KiB
Diff
--- TagsCheck.py~ 2007-03-26 23:01:49.000000000 +0300
|
|
+++ TagsCheck.py 2007-07-31 23:23:08.000000000 +0300
|
|
@@ -629,11 +629,11 @@
|
|
printError(pkg, 'no-license')
|
|
else:
|
|
if rpm_license not in VALID_LICENSES:
|
|
- licenses = re.split('(?:[- ]like|/|ish|[- ]style|[- ]Style|and|or|&|\s|-)+', rpm_license)
|
|
+ licenses = re.split('\s(?:and|or)\s|[()]', rpm_license)
|
|
for l in licenses:
|
|
+ l = l.strip()
|
|
if l != '' and not l in VALID_LICENSES:
|
|
- printWarning(pkg, 'invalid-license', rpm_license)
|
|
- break
|
|
+ printWarning(pkg, 'invalid-license', l)
|
|
|
|
url=pkg[rpm.RPMTAG_URL]
|
|
if url and url != 'none':
|
|
@@ -800,9 +800,7 @@
|
|
|
|
'invalid-license',
|
|
'''The value of the License tag was not recognized. Known values are:
|
|
-%s
|
|
-If the license is close to an existing one, you can use '<license> style'.''' \
|
|
-% fill('"' + '", "'.join(VALID_LICENSES) + '".', 78),
|
|
+%s''' % fill('"' + '", "'.join(VALID_LICENSES) + '".', 78),
|
|
|
|
'invalid-url',
|
|
'''Your URL is not valid. It must begin with http, https or ftp and must no
|