check-mirrors check-mirrors.py, 1.32, 1.33 return-mirrorlist.py, 1.19, 1.20

[Michael Patrick McGrath (mmcgrath)]

Author: mmcgrath

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

Modified Files:
	check-mirrors.py return-mirrorlist.py 
Log Message:
Changes submitted by Mike Canann


Index: check-mirrors.py
===================================================================
RCS file: /cvs/fedora/check-mirrors/check-mirrors.py,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- check-mirrors.py	26 Oct 2006 20:57:52 -0000	1.32
+++ check-mirrors.py	16 Nov 2006 17:33:36 -0000	1.33
@@ -74,7 +74,7 @@
 
 class RepoDB:
     def __init__(self, db):
-        (self.dbconn, self.dbcursor) = self.connect(db)
+        (self.dbconn, self.dbcursor) = self.connect(db, timeout=25.0)
         self.initdb(0)
         return None
 


Index: return-mirrorlist.py
===================================================================
RCS file: /cvs/fedora/check-mirrors/return-mirrorlist.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- return-mirrorlist.py	3 Nov 2006 20:55:06 -0000	1.19
+++ return-mirrorlist.py	16 Nov 2006 17:33:36 -0000	1.20
@@ -148,7 +148,7 @@
 
     def connect(self):
         try:
-            conn = sqlite.connect(self.db)
+            conn = sqlite.connect(self.db, timeout=20.0)
             cursor = conn.cursor()
         except sqlite.Error, errmsg:
             errorprint('Failed to connect to database: %s' % db)
@@ -305,10 +305,10 @@
         else:
             if form.has_key('top'):
                 if not mirrors.printTopMirrors(form['top'].value):
-                    print canonical
+                    print "%s" % re.sub('\$ARCH', arch, canonical)
             else:
                 if not mirrors.printMirrors():
-                    print canonical
+                    print "%s" % re.sub('\$ARCH', arch, canonical)
             
 #        fo = open(return_file, 'r')
 #        for line in fo.readlines():