check-mirrors check-mirrors.conf, 1.3, 1.4 check-mirrors.py, 1.10, 1.11 return-mirrorlist.py, 1.4, 1.5 return-mirrorlist.conf, 1.3, NONE

[Seth Vidal (skvidal)]

Author: skvidal

Update of /cvs/fedora/check-mirrors
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28772

Modified Files:
	check-mirrors.conf check-mirrors.py return-mirrorlist.py 
Removed Files:
	return-mirrorlist.conf 
Log Message:

modify both scripts to use the same config file
remove return-mirrorlist config file.



Index: check-mirrors.conf
===================================================================
RCS file: /cvs/fedora/check-mirrors/check-mirrors.conf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- check-mirrors.conf	11 Jul 2006 14:39:47 -0000	1.3
+++ check-mirrors.conf	13 Jul 2006 15:06:34 -0000	1.4
@@ -4,6 +4,7 @@
 archlist = i386, x86_64, ppc
 timeout = 10
 canonical = http://redhat.download.fedoraproject.org/pub/fedora/linux/core/5/$ARCH/os/
+file_prefix=core-5 
 
 [extras-5]
 inputfile = http://fedora.redhat.com/download/mirrors/fedora-extras-5
@@ -11,4 +12,4 @@
 archlist = i386, x86_64, ppc
 timeout = 10
 canonical = http://redhat.download.fedoraproject.org/pub/fedora/linux/extras/5/$ARCH/
-
+file_prefix=extras-5


Index: check-mirrors.py
===================================================================
RCS file: /cvs/fedora/check-mirrors/check-mirrors.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- check-mirrors.py	12 Jul 2006 15:30:06 -0000	1.10
+++ check-mirrors.py	13 Jul 2006 15:06:34 -0000	1.11
@@ -258,7 +258,12 @@
     
     for section in conf.sections():
         item = MirrorListInfo()
-        item.mirrorid = '%s' % section
+
+        if conf.has_option(section, 'file_prefix'):
+            item.mirrorid = conf.get(section, 'file_prefix')
+        else:
+            item.mirrorid = '%s' % section
+
         broken = False
         
         if conf.has_option(section, 'inputfile'):
@@ -285,7 +290,8 @@
             
         if conf.has_option(section, 'timeout'):
             item.timeout = conf.getint(section, 'timeout')
-        
+
+
         if conf.has_option(section, 'archlist'):
             a_string = conf.get(section, 'archlist')
             


Index: return-mirrorlist.py
===================================================================
RCS file: /cvs/fedora/check-mirrors/return-mirrorlist.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- return-mirrorlist.py	11 Jul 2006 15:17:36 -0000	1.4
+++ return-mirrorlist.py	13 Jul 2006 15:06:34 -0000	1.5
@@ -28,7 +28,7 @@
     cgitb.enable()
 
 __revision__ = '$Id$'
-CONFIG = '/etc/return-mirrorlist.conf'
+CONFIG = '/etc/check-mirrors.conf'
 VERSION = '0.1'
 
 
@@ -53,8 +53,8 @@
     config.prefixes = {}
     
     for section in conf.sections():
-        if conf.has_option(section, 'path'):
-            config.paths[section] = conf.get(section, 'path')
+        if conf.has_option(section, 'outputpath'):
+            config.paths[section] = conf.get(section, 'outputpath')
         if conf.has_option(section, 'file_prefix'):
             config.prefixes[section] = conf.get(section, 'file_prefix')
         else:


--- return-mirrorlist.conf DELETED ---