rpmlint/add-weak-dependencies.diff

105 lines
3.9 KiB
Diff
Raw Normal View History

Index: Pkg.py
===================================================================
--- Pkg.py.orig
+++ Pkg.py
@@ -425,6 +425,10 @@ class Pkg:
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:
@@ -672,6 +676,22 @@ class Pkg:
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
(name, flags, (epoch, version, release)) tuples."""
@@ -708,7 +728,7 @@ class Pkg:
# 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]
@@ -719,7 +739,11 @@ class Pkg:
if prereq is not None and flags[loop] & PREREQ_FLAG:
prereq.append((names[loop], 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((names[loop], flags[loop], evr))
def _gatherDepInfo(self):
@@ -729,6 +753,10 @@ class Pkg:
self._provides = []
self._conflicts = []
self._obsoletes = []
+ self._suggests = []
+ self._supplements = []
+ self._enhances = []
+ self._recommends = []
self._gather_aux(self.header, self._requires,
rpm.RPMTAG_REQUIRENAME,
@@ -748,6 +776,32 @@ class Pkg:
rpm.RPMTAG_OBSOLETEFLAGS,
rpm.RPMTAG_OBSOLETEVERSION)
+ try:
+ self._gather_aux(self.header, self._recommends,
+ rpm.RPMTAG_SUGGESTSNAME,
+ rpm.RPMTAG_SUGGESTSFLAGS,
+ rpm.RPMTAG_SUGGESTSVERSION,
+ strong_only=True)
+ self._gather_aux(self.header, self._suggests,
+ rpm.RPMTAG_SUGGESTSNAME,
+ rpm.RPMTAG_SUGGESTSFLAGS,
+ rpm.RPMTAG_SUGGESTSVERSION,
+ weak_only=True)
+ self._gather_aux(self.header, self._supplements,
+ rpm.RPMTAG_ENHANCESNAME,
+ rpm.RPMTAG_ENHANCESFLAGS,
+ rpm.RPMTAG_ENHANCESVERSION,
+ strong_only=True)
+ self._gather_aux(self.header, self._enhances,
+ rpm.RPMTAG_ENHANCESNAME,
+ rpm.RPMTAG_ENHANCESFLAGS,
+ rpm.RPMTAG_ENHANCESVERSION,
+ weak_only=True)
+
+ except:
+ pass
+
+
def getInstalledPkgs(name):
"""Get list of installed package objects by name."""