[yum-cvs] yum/yum config.py,1.67,1.68 repos.py,1.77,1.78

[Seth Vidal]

Update of /home/groups/yum/cvs/yum/yum
In directory login:/tmp/cvs-serv25887/yum

Modified Files:
	config.py repos.py 
Log Message:

get rid of defineDirs() method integrate it into dirSetup()


Index: config.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/config.py,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- config.py	19 Jun 2005 06:33:51 -0000	1.67
+++ config.py	20 Jun 2005 00:10:10 -0000	1.68
@@ -505,8 +505,6 @@
 
     thisrepo.set('basecachedir', yumconfig.getConfigOption('cachedir'))
     
-    thisrepo.defineDirs()
-    
     return thisrepo
 
 

Index: repos.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/repos.py,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- repos.py	19 Jun 2005 06:33:51 -0000	1.77
+++ repos.py	20 Jun 2005 00:10:10 -0000	1.78
@@ -208,11 +208,17 @@
         return returnlist
 
     def setCache(self, cacheval):
-        """set's cache value in all repos"""
+        """sets cache value in all repos"""
         self.cache = cacheval
         for repo in self.repos.values():
             repo.cache = cacheval
 
+    def setCacheDir(self, cachedir):
+        """sets the cachedir value in all repos"""
+
+        for repo in self.repos.values():
+            repo.basecachedir = cachedir
+
     def setProgressBar(self, obj):
         """set's the progress bar for downloading files from repos"""
         
@@ -436,18 +442,6 @@
     def listSetKeys(self):
         return self.setkeys
     
-    def defineDirs(self):
-        """define the pkgdir, hdrdir and cachedir based on the contents of the
-           basecachedir"""
-
-        cachedir = os.path.join(self.basecachedir, self.id)
-        pkgdir = os.path.join(cachedir, 'packages')
-        hdrdir = os.path.join(cachedir, 'headers')
-        self.set('cachedir', cachedir)
-        self.set('pkgdir', pkgdir)
-        self.set('hdrdir', hdrdir)
-
-        
     def doProxyDict(self):
         if self.proxy_dict:
             return
@@ -503,6 +497,14 @@
 
     def dirSetup(self):
         """make the necessary dirs, if possible, raise on failure"""
+
+        cachedir = os.path.join(self.basecachedir, self.id)
+        pkgdir = os.path.join(cachedir, 'packages')
+        hdrdir = os.path.join(cachedir, 'headers')
+        self.set('cachedir', cachedir)
+        self.set('pkgdir', pkgdir)
+        self.set('hdrdir', hdrdir)
+        
         for dir in [self.cachedir, self.hdrdir, self.pkgdir]:
             if self.cache == 0:
                 if os.path.exists(dir) and os.path.isdir(dir):