[yum-commits] 3 commits - yum/packages.py yum/rpmsack.py yum/update_md.py
James Antill
james at osuosl.org
Thu Mar 22 15:38:19 UTC 2012
yum/packages.py | 3 +++
yum/rpmsack.py | 4 ++--
yum/update_md.py | 6 ++++++
3 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit 5ecbadbffb6961b6e70eedf61ee38ef5f89e4417
Merge: 6549b35 d1e3f67
Author: James Antill <james at and.org>
Date: Thu Mar 22 11:37:55 2012 -0400
Merge branch 'master' of ssh://yum.baseurl.org/srv/projects/yum/git/yum
* 'master' of ssh://yum.baseurl.org/srv/projects/yum/git/yum:
No "Only update available" msg when there is not. BZ 803346
commit 6549b355f93473e7adc8ae177bb65ad2c0ba2dfc
Author: James Antill <james at and.org>
Date: Fri Mar 16 11:12:59 2012 -0400
Fix UpdateNotice.getitem when asked for iteration, add contains. BZ 804120
diff --git a/yum/update_md.py b/yum/update_md.py
index 2cb1acb..7da6a08 100644
--- a/yum/update_md.py
+++ b/yum/update_md.py
@@ -79,8 +79,14 @@ class UpdateNotice(object):
def __getitem__(self, item):
""" Allows scriptable metadata access (ie: un['update_id']). """
+ if type(item) is int:
+ return sorted(self._md)[item]
return self._md.get(item) or None
+ def __contains__(self, item):
+ """ Allows quick tests for foo in blah. """
+ return item in self._md
+
def __setitem__(self, item, val):
self._md[item] = val
commit 8db30114a7994ba04e19a034c20ef3dab04d10e0
Author: James Antill <james at and.org>
Date: Thu Mar 15 12:03:22 2012 -0400
Add strong_requires* props, change rpmdb dep. checks to use them. BZ 795907
diff --git a/yum/packages.py b/yum/packages.py
index 492ccac..da31971 100644
--- a/yum/packages.py
+++ b/yum/packages.py
@@ -663,15 +663,18 @@ class RpmBase(object):
dirlist = property(fget=lambda self: self.returnFileEntries(ftype='dir'))
ghostlist = property(fget=lambda self: self.returnFileEntries(ftype='ghost'))
requires = property(fget=lambda self: self.returnPrco('requires'))
+ strong_requires = property(fget=lambda self: self.returnPrco('strong_requires'))
provides = property(fget=lambda self: self.returnPrco('provides'))
obsoletes = property(fget=lambda self: self.returnPrco('obsoletes'))
conflicts = property(fget=lambda self: self.returnPrco('conflicts'))
provides_names = property(fget=lambda self: self.returnPrcoNames('provides'))
requires_names = property(fget=lambda self: self.returnPrcoNames('requires'))
+ strong_requires_names = property(fget=lambda self: self.returnPrcoNames('strong_requires'))
conflicts_names = property(fget=lambda self: self.returnPrcoNames('conflicts'))
obsoletes_names = property(fget=lambda self: self.returnPrcoNames('obsoletes'))
provides_print = property(fget=lambda self: self.returnPrco('provides', True))
requires_print = property(fget=lambda self: self.returnPrco('requires', True))
+ strong_requires_print = property(fget=lambda self: self.returnPrco('strong_requires', True))
conflicts_print = property(fget=lambda self: self.returnPrco('conflicts', True))
obsoletes_print = property(fget=lambda self: self.returnPrco('obsoletes', True))
changelog = property(fget=lambda self: self.returnChangelog())
diff --git a/yum/rpmsack.py b/yum/rpmsack.py
index 4f2ccd0..ed8e3d1 100644
--- a/yum/rpmsack.py
+++ b/yum/rpmsack.py
@@ -130,7 +130,7 @@ class RPMInstalledPackage(YumInstalledPackage):
def required_packages(self):
pkgset = set()
- for (reqn, reqf, reqevr) in self.requires:
+ for (reqn, reqf, reqevr) in self.strong_requires:
for pkg in self.rpmdb.getProvides(reqn, reqf, reqevr):
if pkg != self:
pkgset.add(pkg)
@@ -1469,7 +1469,7 @@ class RPMDBPackageSack(PackageSackBase):
providers = set() # Speedup, as usual :)
problems = []
for pkg in sorted(pkgs): # The sort here is mainly for "UI"
- for rreq in pkg.requires:
+ for rreq in pkg.strong_requires:
if rreq[0].startswith('rpmlib'): continue
if rreq in providers: continue
More information about the Yum-commits
mailing list