|
 |
4498671 |
diff -up rpmlint-rpmlint-1.9/SpecCheck.py.fixuep rpmlint-rpmlint-1.9/SpecCheck.py
|
|
|
4498671 |
--- rpmlint-rpmlint-1.9/SpecCheck.py.fixuep 2017-02-08 16:54:24.055208215 -0500
|
|
|
4498671 |
+++ rpmlint-rpmlint-1.9/SpecCheck.py 2017-02-08 16:56:05.012862286 -0500
|
|
|
4498671 |
@@ -404,8 +404,9 @@ class SpecCheck(AbstractCheck.AbstractCh
|
|
|
4498671 |
if res:
|
|
|
4498671 |
provs = Pkg.parse_deps(res.group(1))
|
|
|
4498671 |
for prov in unversioned(provs):
|
|
|
4498671 |
- printWarning(pkg, 'unversioned-explicit-provides',
|
|
|
4498671 |
- prov)
|
|
|
4498671 |
+ if not prov.startswith('/'):
|
|
|
4498671 |
+ printWarning(pkg, 'unversioned-explicit-provides',
|
|
|
4498671 |
+ prov)
|
|
|
4498671 |
if compop_regex.search(prov):
|
|
|
4498671 |
printWarning(pkg,
|
|
|
4498671 |
'comparison-operator-in-deptoken',
|
|
|
4498671 |
@@ -415,8 +416,9 @@ class SpecCheck(AbstractCheck.AbstractCh
|
|
|
4498671 |
if res:
|
|
|
4498671 |
obses = Pkg.parse_deps(res.group(1))
|
|
|
4498671 |
for obs in unversioned(obses):
|
|
|
4498671 |
- printWarning(pkg, 'unversioned-explicit-obsoletes',
|
|
|
4498671 |
- obs)
|
|
|
4498671 |
+ if not obs.startswith('/'):
|
|
|
4498671 |
+ printWarning(pkg, 'unversioned-explicit-obsoletes',
|
|
|
4498671 |
+ obs)
|
|
|
4498671 |
if compop_regex.search(obs):
|
|
|
4498671 |
printWarning(pkg,
|
|
|
4498671 |
'comparison-operator-in-deptoken',
|
|
|
4498671 |
diff -up rpmlint-rpmlint-1.9/test/spec/SpecCheck.spec.fixuep rpmlint-rpmlint-1.9/test/spec/SpecCheck.spec
|
|
|
4498671 |
--- rpmlint-rpmlint-1.9/test/spec/SpecCheck.spec.fixuep 2017-02-08 16:56:28.492316699 -0500
|
|
|
4498671 |
+++ rpmlint-rpmlint-1.9/test/spec/SpecCheck.spec 2017-02-08 16:56:57.105651818 -0500
|
|
|
4498671 |
@@ -17,6 +17,8 @@ BuildRoot: %{_tmppath}/%{name}-%{ve
|
|
|
4498671 |
Provides: unversioned-provides, versioned-provides = 1.0
|
|
|
4498671 |
Obsoletes: versioned-obsoletes < 2.0
|
|
|
4498671 |
Obsoletes: unversioned-obsoletes
|
|
|
4498671 |
+Obsoletes: /usr/bin/unversioned-but-filename
|
|
|
4498671 |
+Provides: /sbin/another-unversioned-but-filename
|
|
|
4498671 |
|
|
|
4498671 |
%description
|
|
|
4498671 |
SpecCheck test.
|
|
|
4498671 |
diff -up rpmlint-rpmlint-1.9/test/test.SpecCheck.py.fixuep rpmlint-rpmlint-1.9/test/test.SpecCheck.py
|
|
|
4498671 |
--- rpmlint-rpmlint-1.9/test/test.SpecCheck.py.fixuep 2017-02-08 16:57:15.938214210 -0500
|
|
|
4498671 |
+++ rpmlint-rpmlint-1.9/test/test.SpecCheck.py 2017-02-08 16:57:54.448319360 -0500
|
|
|
4498671 |
@@ -25,10 +25,12 @@ class TestSpecCheck(unittest.TestCase):
|
|
|
4498671 |
in out)
|
|
|
4498671 |
self.assertTrue("unversioned-explicit-provides versioned-provides"
|
|
|
4498671 |
not in out)
|
|
|
4498671 |
+ self.assertTrue("unversioned-explicit-provides /" not in out)
|
|
|
4498671 |
self.assertTrue("unversioned-explicit-obsoletes unversioned-obsoletes"
|
|
|
4498671 |
in out)
|
|
|
4498671 |
self.assertTrue("unversioned-explicit-obsoletes versioned-obsoletes"
|
|
|
4498671 |
not in out)
|
|
|
4498671 |
+ self.assertTrue("unversioned-explicit-obsoletes /" not in out)
|
|
|
4498671 |
self.assertTrue("setup-not-quiet" in out)
|
|
|
4498671 |
|
|
|
4498671 |
if __name__ == '__main__':
|