[yum-cvs] yum yum-updatesd.py,1.22.2.1,1.22.2.2

[Seth Vidal]

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

Modified Files:
      Tag: yum-3_0_X
	yum-updatesd.py 
Log Message:

- remove IncludingConfigParser,IncludedConfigParser
- make yum-updatesd.py use ConfigPreProcessor for include= config files


Index: yum-updatesd.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum-updatesd.py,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -u -r1.22.2.1 -r1.22.2.2
--- yum-updatesd.py	5 Oct 2006 13:34:36 -0000	1.22.2.1
+++ yum-updatesd.py	17 Oct 2006 03:54:19 -0000	1.22.2.2
@@ -44,7 +44,8 @@
 import yum.Errors
 import syslog
 from yum.config import BaseConfig, Option, IntOption, ListOption, BoolOption
-from yum.parser import IncludingConfigParser
+from yum.parser import ConfigPreProcessor
+from ConfigParser import ConfigParser, ParsingError
 from yum.constants import *
 from yum.update_md import UpdateMetadata
 
@@ -583,11 +584,17 @@
         os.dup2(fd, 2)
         os.close(fd)
 
-    confparser = IncludingConfigParser()
+
+    confparser = ConfigParser()
     opts = UDConfig()
     
     if os.path.exists(config_file):
-        confparser.read(config_file)
+        confpp_obj = ConfigPreProcessor(config_file)
+        try:
+            confparser.readfp(confpp_obj)
+        except ParsingError, e:
+            print >> sys.stderr, "Error reading config file: %s" % e
+            sys.exit(1)
 
     syslog.openlog("yum-updatesd", 0, syslog.LOG_DAEMON)