forked from pool/rpmlint
Dirk Mueller
1cdbc13b57
* test: Skip fedoradev GPG checks at least for now * test: Refresh fedora* packages on image build * test: Use assertEqual where appropriate, thanks to flake8/hacking * test: Update fedora24 config to fedora26, run it on Travis * Add a new test for tmpfiles.d snippets in the /etc/ tree. * Add new tests for systemd units and udev rules in /etc/ tree * test: Disable hacking for now until it's flake8 3.4+ compatible * test: Set up flake8-bugbear, enable it in fedoradev container * rpmlint: Avoid unused loop control variable * ZipCheck: Add TODO * *: Avoid mutable argument defaults * Be aware of -debugsource packages * rpmdiff: Fix unused variable from previous commit * rpmdiff: Support soft dependencies * BinariesCheck, FilesCheck: Ignore various .build-id dirs * Add python3-devel and rpm-build to fedoradev container to provoke some issues * BinariesCheck: Popen env consistency fix * Pkg.getstatusoutput: Set LC_ALL for all Popens, defaulting to C * rpmlint: Fix checking specfile from stdin * test.sh: Extract rpmlint command to run_rpmlint * Revert "Remove unused spec_lines check_spec argument" * BinariesCheck: Trivial cleanups * travis: Run make install too * FilesCheck: Allow multiple bytecode magic values per Python version * tests: Make output test tools easier to reuse * FilesCheck: hg.python.org -> github.com/python * Pkg: Return vendor and distribution as unicode strings * FilesCheck: Add Python 3.7 bytecode magic value * Pkg.b2s: Add some more test cases OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=482
111 lines
3.9 KiB
Diff
111 lines
3.9 KiB
Diff
From: Some One <nobody@opensuse.org>
|
|
Date: Thu, 9 Apr 2015 14:55:39 +0200
|
|
Subject: [PATCH] add-weak-dependencies.diff
|
|
|
|
===================================================================
|
|
---
|
|
Pkg.py | 29 +++++++++++++++++++++++++++--
|
|
TagsCheck.py | 19 +++++++++++++++++++
|
|
2 files changed, 46 insertions(+), 2 deletions(-)
|
|
|
|
Index: rpmlint-rpmlint-1.10/Pkg.py
|
|
===================================================================
|
|
--- rpmlint-rpmlint-1.10.orig/Pkg.py
|
|
+++ rpmlint-rpmlint-1.10/Pkg.py
|
|
@@ -494,6 +494,10 @@ class Pkg(AbstractPkg):
|
|
self._missingok_files = None
|
|
self._files = None
|
|
self._requires = None
|
|
+ self._suggests = None
|
|
+ self._supplements = None
|
|
+ self._enhances = None
|
|
+ self._recommends = None
|
|
self._req_names = -1
|
|
|
|
if header:
|
|
@@ -771,6 +775,22 @@ class Pkg(AbstractPkg):
|
|
self._gatherDepInfo()
|
|
return self._requires
|
|
|
|
+ def recommends(self):
|
|
+ self._gatherDepInfo()
|
|
+ return self._recommends
|
|
+
|
|
+ def suggests(self):
|
|
+ self._gatherDepInfo()
|
|
+ return self._suggests
|
|
+
|
|
+ def supplements(self):
|
|
+ self._gatherDepInfo()
|
|
+ return self._supplements
|
|
+
|
|
+ def enhances(self):
|
|
+ self._gatherDepInfo()
|
|
+ return self._enhances
|
|
+
|
|
def prereq(self):
|
|
"""
|
|
Get package PreReqs as list of
|
|
@@ -845,7 +865,7 @@ class Pkg(AbstractPkg):
|
|
|
|
# internal function to gather dependency info used by the above ones
|
|
def _gather_aux(self, header, list, nametag, flagstag, versiontag,
|
|
- prereq=None):
|
|
+ prereq = None, strong_only = False, weak_only = False):
|
|
names = header[nametag]
|
|
flags = header[flagstag]
|
|
versions = header[versiontag]
|
|
@@ -856,7 +876,11 @@ class Pkg(AbstractPkg):
|
|
evr = stringToVersion(b2s(versions[loop]))
|
|
if prereq is not None and flags[loop] & PREREQ_FLAG:
|
|
prereq.append((name, flags[loop] & (~PREREQ_FLAG), evr))
|
|
- else:
|
|
+ elif strong_only and flags[loop] & rpm.RPMSENSE_STRONG:
|
|
+ list.append((names[loop], versions[loop], flags[loop] & (~rpm.RPMSENSE_STRONG)))
|
|
+ elif weak_only and not (flags[loop] & rpm.RPMSENSE_STRONG):
|
|
+ list.append((names[loop], versions[loop], flags[loop]))
|
|
+ elif not (weak_only or strong_only):
|
|
list.append((name, flags[loop], evr))
|
|
|
|
def _gatherDepInfo(self):
|
|
@@ -924,6 +948,7 @@ class Pkg(AbstractPkg):
|
|
return prog
|
|
|
|
|
|
+
|
|
def getInstalledPkgs(name):
|
|
"""Get list of installed package objects by name."""
|
|
|
|
Index: rpmlint-rpmlint-1.10/TagsCheck.py
|
|
===================================================================
|
|
--- rpmlint-rpmlint-1.10.orig/TagsCheck.py
|
|
+++ rpmlint-rpmlint-1.10/TagsCheck.py
|
|
@@ -899,8 +899,27 @@ class TagsCheck(AbstractCheck.AbstractCh
|
|
value = Pkg.formatRequire(*c)
|
|
self._unexpanded_macros(pkg, 'Conflicts %s' % (value,), value)
|
|
|
|
+ for i in pkg.supplements():
|
|
+ value = Pkg.formatRequire(*i)
|
|
+ self._unexpanded_macros(pkg, 'Supplements %s' % (value,), value)
|
|
+
|
|
+ for i in pkg.suggests():
|
|
+ value = Pkg.formatRequire(*i)
|
|
+ self._unexpanded_macros(pkg, 'Suggests %s' % (value,), value)
|
|
+
|
|
+ for i in pkg.enhances():
|
|
+ value = Pkg.formatRequire(*i)
|
|
+ self._unexpanded_macros(pkg, 'Enhances %s' % (value,), value)
|
|
+
|
|
+ for i in pkg.recommends():
|
|
+ value = Pkg.formatRequire(*i)
|
|
+ self._unexpanded_macros(pkg, 'Recommends %s' % (value,), value)
|
|
+
|
|
obss = pkg.obsoletes()
|
|
if obss:
|
|
+ for obs in obss:
|
|
+ value = Pkg.formatRequire(*obs)
|
|
+ self._unexpanded_macros(pkg, 'Obsoletes %s' % (value,), value)
|
|
provs = pkg.provides()
|
|
for prov in provs:
|
|
for obs in obss:
|