[yum-cvs] yum-utils package-cleanup.py,1.10,1.11

[Jeremy Katz]

Update of /home/groups/yum/cvs/yum-utils
In directory login1.linux.duke.edu:/tmp/cvs-serv30355

Modified Files:
	package-cleanup.py 
Log Message:
api change fixes from tim


Index: package-cleanup.py
===================================================================
RCS file: /home/groups/yum/cvs/yum-utils/package-cleanup.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- package-cleanup.py	24 Feb 2006 21:34:19 -0000	1.10
+++ package-cleanup.py	18 Sep 2006 15:43:44 -0000	1.11
@@ -29,17 +29,15 @@
 import os
 import sys
 import rpm
+
 from rpmUtils import miscutils, transaction
-from yum.logger import Logger
 from optparse import OptionParser
 from yum.packages import YumInstalledPackage
 from yum import Errors
 
 def initYum(opts):
     my = yum.YumBase()
-    my.doConfigSetup(opts.conffile)
-    my.log = Logger(threshold=my.conf.debuglevel, 
-    file_object =sys.stdout)
+    my.doConfigSetup(opts.conffile,init_plugins=False)
     if opts.orphans:
         my.doRepoSetup()
     else:
@@ -57,8 +55,9 @@
 def getLocalRequires(my):
     """Get a list of all requirements in the local rpmdb"""
     pkgs = {}
-    for header in my.rpmdb.getHdrList():
-        tup = my.rpmdb._hdr2pkgTuple(header)
+    for po in my.rpmdb.returnPackages():
+        tup = po.pkgtup
+        header= po.hdr
         requires = zip(
             header[rpm.RPMTAG_REQUIRENAME],
             header[rpm.RPMTAG_REQUIREFLAGS],
@@ -118,7 +117,7 @@
     refined = {}
     dupes = []
     
-    for (n,a,e,v,r) in my.rpmdb.pkglists:
+    for (n,a,e,v,r) in my.rpmdb.simplePkgList():
         if not pkgdict.has_key((n,a)):
             pkgdict[(n,a)] = []
         pkgdict[(n,a)].append((e,v,r))
@@ -157,7 +156,7 @@
             print "%s-%s-%s.%s" % (pkg[0],pkg[3],pkg[4],pkg[1])
 
 def listOrphans(my):
-    installed = my.rpmdb.getPkgList()
+    installed = my.rpmdb.simplePkgList()
     for pkgtup in installed:
         (n,a,e,v,r) = pkgtup
         if n == "gpg-pubkey":