[yum-cvs] yum cli.py,1.225,1.226 yum-updatesd.py,1.15,1.16
Seth Vidal
skvidal at linux.duke.edu
Sun Aug 20 13:52:05 UTC 2006
Update of /home/groups/yum/cvs/yum
In directory login1.linux.duke.edu:/tmp/cvs-serv5601
Modified Files:
cli.py yum-updatesd.py
Log Message:
checking in lots of minor changes to get rid of deprecation warnings
add 'po' keyword to rpmsack.searchNevra so a package object can be passed in
instead of just nevras. Maybe should be a new method to just take the
package object or a more generic search method.
Index: cli.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/cli.py,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -r1.225 -r1.226
--- cli.py 19 Aug 2006 20:19:12 -0000 1.225
+++ cli.py 20 Aug 2006 13:52:03 -0000 1.226
@@ -721,7 +721,6 @@
self.doRepoSetup()
self.doRpmDBSetup()
- installed = self.rpmdb.getPkgList()
avail = self.pkgSack.returnPackages()
toBeInstalled = {} # keyed on name
passToUpdate = [] # list of pkgtups to pass along to updatecheck
@@ -759,18 +758,18 @@
# we look through each returned possibility and rule out the
# ones that we obviously can't use
for pkg in installable:
- if pkg.pkgtup in installed:
+ if self.rpmdb.installed(pkg):
self.verbose_logger.log(logginglevels.DEBUG_3,
'Package %s is already installed, skipping', pkg)
continue
# everything installed that matches the name
- installedByKey = self.rpmdb.returnTupleByKeyword(name=pkg.name)
+ installedByKey = self.rpmdb.searchNevra(name=pkg.name)
comparable = []
- for instTup in installedByKey:
- (n2, a2, e2, v2, r2) = instTup
+ for instpo in installedByKey:
+ (n2, a2, e2, v2, r2) = instpo.pkgtup
if rpmUtils.arch.isMultiLibArch(a2) == rpmUtils.arch.isMultiLibArch(pkg.arch):
- comparable.append(instTup)
+ comparable.append(instpo.pkgtup)
else:
self.verbose_logger.log(logginglevels.DEBUG_3,
'Discarding non-comparable pkg %s.%s', n2, a2)
@@ -846,7 +845,7 @@
self.doRepoSetup()
avail = self.pkgSack.simplePkgList()
self.doRpmDBSetup()
- installed = self.rpmdb.getPkgList()
+ installed = self.rpmdb.simplePkgList()
self.doUpdateSetup()
updates = self.up.getUpdatesTuples()
if self.conf.obsoletes:
@@ -857,7 +856,7 @@
if len(userlist) == 0: # simple case - do them all
for (obsoleting, installed) in obsoletes:
obsoleting_pkg = self.getPackageObject(obsoleting)
- installed_pkg = YumInstalledPackage(self.rpmdb.returnHeaderByTuple(installed)[0])
+ installed_pkg = self.rpmdb.packagesByTuple(installed)[0]
self.tsInfo.addObsoleting(obsoleting_pkg, installed_pkg)
self.tsInfo.addObsoleted(installed_pkg, obsoleting_pkg)
@@ -868,7 +867,7 @@
self.verbose_logger.log(logginglevels.DEBUG_2, 'Not Updating Package that is already obsoleted: %s.%s %s:%s-%s', old)
else:
updating_pkg = self.getPackageObject(new)
- updated_pkg = YumInstalledPackage(self.rpmdb.returnHeaderByTuple(old)[0])
+ updated_pkg = self.rpmdb.packagesByTuple(old)[0]
self.tsInfo.addUpdate(updating_pkg, updated_pkg)
@@ -903,7 +902,7 @@
for po in updateMatches:
for (new, old) in updates:
if po.pkgtup == new:
- updated_pkg = YumInstalledPackage(self.rpmdb.returnHeaderByTuple(old)[0])
+ updated_pkg = self.rpmdb.packagesByTuple(old)[0]
self.tsInfo.addUpdate(po, updated_pkg)
@@ -927,9 +926,7 @@
userlist = self.extcmds
self.doRpmDBSetup()
- installed = []
- for po in self.rpmdb:
- installed.append(po)
+ installed = self.rpmdb.returnPackages()
if len(userlist) > 0: # if it ain't well, that'd be real _bad_ :)
exactmatch, matched, unmatched = yum.packages.parsePackages(
@@ -991,7 +988,7 @@
po.localpath, po)
# everything installed that matches the name
- installedByKey = self.rpmdb.returnTupleByKeyword(name=po.name)
+ installedByKey = self.rpmdb.searchNevra(name=po.name)
# go through each package
if len(installedByKey) == 0: # nothing installed by that name
if updateonly:
@@ -1000,8 +997,7 @@
installpkgs.append(po)
continue
- for instTup in installedByKey:
- installed_pkg = YumInstalledPackage(self.rpmdb.returnHeaderByTuple(instTup)[0])
+ for installed_pkg in installedByKey:
(n, a, e, v, r) = po.pkgtup
(n2, a2, e2, v2, r2) = installed_pkg.pkgtup
rc = compareEVR((e2, v2, r2), (e, v, r))
Index: yum-updatesd.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum-updatesd.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- yum-updatesd.py 9 Aug 2006 14:44:07 -0000 1.15
+++ yum-updatesd.py 20 Aug 2006 13:52:03 -0000 1.16
@@ -60,12 +60,6 @@
config_file = '/etc/yum/yum-updatesd.conf'
-# FIXME: this is kind of gross -- hopefully the rpmdb as a sack stuff will
-# make this not really be needed
-def pkgFromInstalledTuple(pkgtup, rpmdb):
- return YumInstalledPackage(rpmdb.returnHeaderByTuple(pkgtup)[0])
-
-
class UpdateEmitter(object):
"""Abstract object for implementing different types of emitters."""
def __init__(self):
@@ -348,13 +342,13 @@
self.updateInfo = []
for (new, old) in self.up.getUpdatesTuples():
n = getDbusPackageDict(self.getPackageObject(new))
- o = getDbusPackageDict(pkgFromInstalledTuple(old, self.rpmdb))
+ o = getDbusPackageDict(self.rpmdb.packagesByTuple(old)[0])
self.updateInfo.append((n, o))
if self.conf.obsoletes:
for (obs, inst) in self.up.getObsoletesTuples():
n = getDbusPackageDict(self.getPackageObject(obs))
- o = getDbusPackageDict(pkgFromInstalledTuple(inst, self.rpmdb))
+ o = getDbusPackageDict(self.rpmdb.packagesByTuple(inst)[0])
self.updateInfo.append((n, o))
self.updateInfoTime = time.time()
@@ -363,7 +357,7 @@
# figure out the updates
for (new, old) in self.up.getUpdatesTuples():
updating = self.getPackageObject(new)
- updated = pkgFromInstalledTuple(old, self.rpmdb)
+ updated = self.rpmdb.packagesByTuple(old)[0]
self.tsInfo.addUpdate(updating, updated)
@@ -371,7 +365,7 @@
if self.conf.obsoletes:
for (obs, inst) in self.up.getObsoletesTuples():
obsoleting = self.getPackageObject(obs)
- installed = pkgFromInstalledTuple(inst, self.rpmdb)
+ installed = self.rpmdb.packagesByTuple(inst)[0]
self.tsInfo.addObsoleting(obsoleting, installed)
self.tsInfo.addObsoleted(installed, obsoleting)
More information about the Yum-cvs-commits
mailing list