[yum-cvs] yum/yum yumRepo.py,1.41,1.42

Jeremy Katz katzj at linux.duke.edu
Mon Mar 5 22:26:45 UTC 2007


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

Modified Files:
	yumRepo.py 
Log Message:
YumRepository.__get -> YumRepository._getFile.  and a placeholder compat
stub although I don't know how it could be used in reality


Index: yumRepo.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/yumRepo.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- yumRepo.py	28 Feb 2007 19:03:17 -0000	1.41
+++ yumRepo.py	5 Mar 2007 22:26:43 -0000	1.42
@@ -427,7 +427,7 @@
         self.check()
         self.setupGrab() # update the grabber for the urls
 
-    def __get(self, url=None, relative=None, local=None, start=None, end=None,
+    def _getFile(self, url=None, relative=None, local=None, start=None, end=None,
             copy_local=0, checkfunc=None, text=None, reget='simple', cache=True):
         """retrieve file from the mirrorgroup for the repo
            relative to local, optionally get range from
@@ -519,13 +519,14 @@
                 raise Errors.RepoError, "failure: %s from %s: %s" % (relative, self.id, e)
 
         return result
+    __get = _getFile
 
     def getPackage(self, package, checkfunc = None, text = None, cache = True):
         remote = package.relativepath
         local = package.localPkg()
         basepath = package.basepath
             
-        return self.__get(url=basepath,
+        return self._getFile(url=basepath,
                         relative=remote,
                         local=local,
                         checkfunc=checkfunc,
@@ -542,7 +543,7 @@
         end = package.hdrend
         basepath = package.basepath
 
-        return self.__get(url=basepath, relative=remote, local=local, start=start,
+        return self._getFile(url=basepath, relative=remote, local=local, start=start,
                         reget=None, end=end, checkfunc=checkfunc, copy_local=1,
                         cache=cache,
                         )
@@ -608,7 +609,7 @@
         else:
             checkfunc = (self._checkRepoXML, (), {})
             try:
-                result = self.__get(relative=remote,
+                result = self._getFile(relative=remote,
                                   local=local,
                                   copy_local=1,
                                   text=text,
@@ -707,7 +708,7 @@
 
         try:
             checkfunc = (self.checkMD, (mdtype,), {})
-            local = self.__get(relative=remote, local=local, copy_local=1,
+            local = self._getFile(relative=remote, local=local, copy_local=1,
                              checkfunc=checkfunc, reget=None,
                              cache=self.http_caching == 'all')
         except URLGrabError, e:




More information about the Yum-cvs-commits mailing list