[yum-cvs] yum-utils repoquery.py,1.32,1.33

Paul Nasrat pnasrat at linux.duke.edu
Tue Jun 13 15:23:39 UTC 2006


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

Modified Files:
	repoquery.py 
Log Message:
new yum api

Index: repoquery.py
===================================================================
RCS file: /home/groups/yum/cvs/yum-utils/repoquery.py,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- repoquery.py	3 Apr 2006 15:45:41 -0000	1.32
+++ repoquery.py	13 Jun 2006 15:23:28 -0000	1.33
@@ -30,7 +30,6 @@
 import yum.config
 import yum.Errors
 import yum.packages
-import repomd.mdErrors
 from rpmUtils.arch import getArchList
 from rpmUtils.miscutils import formatRequire
 from yum.misc import getCacheDir
@@ -325,7 +324,7 @@
         try:
             exact, match, unmatch = yum.packages.parsePackages(self.returnPkgList(), [name], casematch=1)
             pkgs = exact + match
-        except repomd.mdErrors.PackageSackError, err:
+        except yum.Errors.PackageSackError, err:
             self.errorlog(0, err)
         return self.queryPkgFactory(pkgs)
 
@@ -615,7 +614,8 @@
         pkgops.append("queryformat")
 
     repoq = YumBaseQuery(pkgops, sackops, opts)
-    repoq.doConfigSetup(opts.conffile)
+    repoq.doStartupConfig(fn=opts.conffile)
+    repoq.doConfigSetup()
     
     if os.geteuid() != 0 or opts.tempcache:
         cachedir = getCacheDir()




More information about the Yum-cvs-commits mailing list