[yum-cvs] /yum-utils repoclosure.py, 1.15, 1.16 repoquery.py, 1.41, 1.42 repo-rss.py, 1.6, 1.7

Tim Lauridsen timlau at linux.duke.edu
Mon Feb 19 12:32:20 UTC 2007


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

Modified Files:
	repoclosure.py repoquery.py repo-rss.py 
Log Message:
changed 'with=' to 'mdtype=' in repos.populateSack calls, because of changes
in the yum API in YumPackageSack.populate method to avoid warnings about 'with' is a reserved word in Python 2.6.

Index: repoclosure.py
===================================================================
RCS file: /home/groups/yum/cvs//yum-utils/repoclosure.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- repoclosure.py	5 Feb 2007 13:46:27 -0000	1.15
+++ repoclosure.py	19 Feb 2007 12:32:18 -0000	1.16
@@ -94,7 +94,7 @@
             archs.append('src')
         self.doSackSetup(archs)
         for repo in self.repos.listEnabled():
-            self.repos.populateSack(which=[repo.id], with='filelists')
+            self.repos.populateSack(which=[repo.id], mdtype='filelists')
 
     def getBrokenDeps(self, newest=False):
         unresolved = {}

Index: repoquery.py
===================================================================
RCS file: /home/groups/yum/cvs//yum-utils/repoquery.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- repoquery.py	11 Jan 2007 17:13:52 -0000	1.41
+++ repoquery.py	19 Feb 2007 12:32:18 -0000	1.42
@@ -675,9 +675,9 @@
         repoq.doSackSetup(archlist=archlist)
         repoq.doTsSetup()
         if needfiles:
-            repoq.repos.populateSack(with='filelists')
+            repoq.repos.populateSack(mdtype='filelists')
         if needother:
-            repoq.repos.populateSack(with='otherdata')
+            repoq.repos.populateSack(mdtype='otherdata')
         if needgroup:
             repoq.doGroupSetup()
     except yum.Errors.RepoError, e:

Index: repo-rss.py
===================================================================
RCS file: /home/groups/yum/cvs//yum-utils/repo-rss.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- repo-rss.py	14 Feb 2007 14:31:18 -0000	1.6
+++ repo-rss.py	19 Feb 2007 12:32:18 -0000	1.7
@@ -19,7 +19,7 @@
 import yum.Errors
 from yum.misc import getCacheDir
 from yum.comps import Comps, CompsException
-from repomd.mdErrors import RepoMDError
+from yum.Errors import RepoMDError
 import sys
 import os
 import libxml2
@@ -208,7 +208,7 @@
     for repo in my.repos.listEnabled():
             
         try:
-            my.repos.populateSack(which=[repo.id], with='otherdata')
+            my.repos.populateSack(which=[repo.id], mdtype='otherdata')
         except yum.Errors.RepoError, e:
             print >> sys.stderr, 'otherdata not available for repo: %s' % repo
             print >> sys.stderr, 'run as root to get changelog data'




More information about the Yum-cvs-commits mailing list