[yum-cvs] yum/yum __init__.py,1.200,1.201

[Seth Vidal]

Update of /home/groups/yum/cvs/yum/yum
In directory login1.linux.duke.edu:/tmp/cvs-serv24051

Modified Files:
	__init__.py 
Log Message:

merge up fix for 191013 from 2.6 branch


Index: __init__.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/__init__.py,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- __init__.py	19 Apr 2006 22:00:47 -0000	1.200
+++ __init__.py	8 May 2006 15:40:55 -0000	1.201
@@ -26,7 +26,7 @@
 import time
 import sre_constants
 import glob
-
+from ConfigParser import ParsingError
 
 import Errors
 import rpmUtils
@@ -132,8 +132,11 @@
             if os.path.isdir(reposdir):
                 #XXX: why can't we just pass the list of files?
                 files = ' '.join(glob.glob('%s/*.repo' % reposdir))
-                #XXX: error catching here
-                parser.read(files)
+                try:
+                    parser.read(files)
+                except ConfigParser.ParsingError, e:
+                    msg = str(e)
+                    raise Errors.ConfigError, msg
 
         # Check sections in the .repo files that were just slurped up
         for section in parser.sections():