[yum-cvs] yum/yum config.py, 1.72.2.2, 1.72.2.3 repos.py, 1.83.2.1, 1.83.2.2

[Seth Vidal]

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

Modified Files:
      Tag: yum-2_4_X
	config.py repos.py 
Log Message:

fix the repomd.xml backport <sigh>


Index: config.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/config.py,v
retrieving revision 1.72.2.2
retrieving revision 1.72.2.3
diff -u -r1.72.2.2 -r1.72.2.3
--- config.py	7 Nov 2005 00:50:07 -0000	1.72.2.2
+++ config.py	7 Nov 2005 00:59:53 -0000	1.72.2.3
@@ -201,7 +201,7 @@
                       ('errorlevel', 2), 
                       ('retries', 10),
                       ('recent', 7),
-                      ('metadata_expire', 28800]
+                      ('metadata_expire', 28800)]
                       
                       
         #defaults -either get them or set them
@@ -483,7 +483,10 @@
             HTTP_CACHING_VALS
             )
         )
-
+    thisrepo.set('metadata_expire', cfgparser._getint(
+           section, 'metadata_expire',
+           yumconfig.getConfigOption('metadata_expire')))
+           
     # Parse and check gpgkey URLs
     gpgkeys = cfgparser._getoption(section, 'gpgkey', '')
     gpgkeys = variableReplace(yumconfig.yumvar, gpgkeys)
@@ -515,7 +518,7 @@
     thisrepo.set('includepkgs', includelist)
 
     thisrepo.set('basecachedir', yumconfig.getConfigOption('cachedir'))
-    thisrepo.set('metadata_expire', yumconfig.getConfigOption('metadata_expire'))
+
     
     return thisrepo
 

Index: repos.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/repos.py,v
retrieving revision 1.83.2.1
retrieving revision 1.83.2.2
diff -u -r1.83.2.1 -r1.83.2.2
--- repos.py	7 Nov 2005 00:50:07 -0000	1.83.2.1
+++ repos.py	7 Nov 2005 00:59:53 -0000	1.83.2.2
@@ -20,6 +20,7 @@
 import fnmatch
 import urlparse
 import types
+import time
 
 import Errors
 from urlgrabber.grabber import URLGrabber