[yum-cvs] yum/yum __init__.py,1.224,1.225

[Seth Vidal]

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

Modified Files:
	__init__.py 
Log Message:

- make rpmsack the default rpmdb interface
- some minor pychecker cleanups


Index: __init__.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/__init__.py,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -r1.224 -r1.225
--- __init__.py	9 Aug 2006 04:14:19 -0000	1.224
+++ __init__.py	19 Aug 2006 19:22:19 -0000	1.225
@@ -31,9 +31,10 @@
 from ConfigParser import ParsingError
 
 import Errors
-import rpmUtils
+import rpmsack
 import rpmUtils.updates
 import rpmUtils.arch
+import rpmUtils.transaction
 import comps
 import config
 import parser
@@ -238,7 +239,7 @@
         installroot = self.conf.installroot
         self.read_ts = rpmUtils.transaction.initReadOnlyTransaction(root=installroot)
         self.tsInfo = self._transactionDataFactory()
-        self.rpmdb = rpmUtils.RpmDBHolder()
+        self.rpmdb = rpmsack.RPMDBPackageSack()
         self.initActionTs()
         
     def doRpmDBSetup(self):
@@ -751,7 +752,7 @@
         else:
             if self.conf.cache:
                 raise Errors.RepoError, \
-                'Header not in local cache and caching-only mode enabled. Cannot download %s' % remote
+                'Header not in local cache and caching-only mode enabled. Cannot download %s' po.hdrpath
         
         if self.dsCallback: self.dsCallback.downloadHeader(po.name)
         
@@ -2064,7 +2065,7 @@
             elif askcb:
                 rc = askcb(po, userid, hexkeyid)
 
-            if rc != True:
+            if not rc:
                 return Errors.YumBaseError, "Not installing key"
             
             # Import the key