26 lines
1.2 KiB
Diff
26 lines
1.2 KiB
Diff
|
Index: TagsCheck.py
|
||
|
|
===================================================================
|
||
|
|
RCS file: /cooker/soft/rpmlint/TagsCheck.py,v
|
||
|
|
retrieving revision 1.84
|
||
|
|
diff -u -r1.84 TagsCheck.py
|
||
|
|
--- TagsCheck.py 1 Jul 2005 02:59:46 -0000 1.84
|
||
|
|
+++ TagsCheck.py 6 Jul 2005 14:19:23 -0000
|
||
|
|
@@ -419,6 +419,7 @@
|
||
|
|
packager_regex=re.compile(Config.getOption('Packager', DEFAULT_PACKAGER))
|
||
|
|
basename_regex=re.compile('/?([^/]+)$')
|
||
|
|
changelog_version_regex=re.compile('[^>]([^ >]+)\s*$')
|
||
|
|
+fedora_disttag_regex=re.compile('\.(fc|rhe?l)\d+$')
|
||
|
|
release_ext=Config.getOption('ReleaseExtension', 'mdk')
|
||
|
|
extension_regex=release_ext and re.compile(release_ext + '$')
|
||
|
|
use_version_in_changelog=Config.getOption('UseVersionInChangelog', 1)
|
||
|
|
@@ -626,7 +627,8 @@
|
||
|
|
expected=version + '-' + release
|
||
|
|
if epoch is not None:
|
||
|
|
expected=str(epoch) + ':' + expected
|
||
|
|
- if expected != ret.group(1):
|
||
|
|
+ if ret.group(1) not in (expected, fedora_disttag_regex.sub('', expected)):
|
||
|
|
+
|
||
|
|
printWarning(pkg, 'incoherent-version-in-changelog', ret.group(1), expected)
|
||
|
|
|
||
|
|
# provides=pkg.provides()
|