[yum-cvs] yum/yum config.py, 1.66, 1.67 depsolve.py, 1.64, 1.65 repos.py, 1.76, 1.77

[Seth Vidal]

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

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

needed a space there, I dunno


Index: config.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/config.py,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- config.py	16 Jun 2005 12:23:31 -0000	1.66
+++ config.py	19 Jun 2005 06:33:51 -0000	1.67
@@ -503,12 +503,9 @@
     includelist = parseList(includelist)
     thisrepo.set('includepkgs', includelist)
 
-    cachedir = os.path.join(yumconfig.getConfigOption('cachedir'), section)
-    pkgdir = os.path.join(cachedir, 'packages')
-    hdrdir = os.path.join(cachedir, 'headers')
-    thisrepo.set('cachedir', cachedir)
-    thisrepo.set('pkgdir', pkgdir)
-    thisrepo.set('hdrdir', hdrdir)
+    thisrepo.set('basecachedir', yumconfig.getConfigOption('cachedir'))
+    
+    thisrepo.defineDirs()
     
     return thisrepo
 

Index: depsolve.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/depsolve.py,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- depsolve.py	29 May 2005 06:14:36 -0000	1.64
+++ depsolve.py	19 Jun 2005 06:33:51 -0000	1.65
@@ -353,6 +353,7 @@
     def _requiringFromInstalled(self, requiringPkg, requirement, errorlist):
         """processes the dependency resolution for a dep where the requiring 
            package is installed"""
+           
         (name, arch, epoch, ver, rel) = requiringPkg
         requiringPo = self.getInstalledPackageObject(requiringPkg)
         

Index: repos.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/repos.py,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- repos.py	16 Jun 2005 12:23:31 -0000	1.76
+++ repos.py	19 Jun 2005 06:33:51 -0000	1.77
@@ -337,6 +337,7 @@
         self.proxy_dict = {}
         
         # throw in some stubs for things that will be set by the config class
+        self.basecachedir = ""
         self.cachedir = ""
         self.pkgdir = ""
         self.hdrdir = ""
@@ -435,6 +436,18 @@
     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