[yum-cvs] yum/yum __init__.py,1.268,1.269 config.py,1.109,1.110

[James Bowes]

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

Modified Files:
	__init__.py config.py 
Log Message:
Store all config files under /etc/yum, with no fallback.

Index: __init__.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/__init__.py,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -r1.268 -r1.269
--- __init__.py	22 Jan 2007 04:33:22 -0000	1.268
+++ __init__.py	27 Jan 2007 03:04:49 -0000	1.269
@@ -89,8 +89,8 @@
         self.doRpmDBSetup()
         self.doRepoSetup()
         self.doSackSetup()
-       
-    def doConfigSetup(self, fn='/etc/yum.conf', root='/', init_plugins=True,
+
+    def doConfigSetup(self, fn='/etc/yum/yum.conf', root='/', init_plugins=True,
             plugin_types=(plugins.TYPE_CORE,), optparser=None, debuglevel=None,
             errorlevel=None):
         '''
@@ -110,7 +110,7 @@
             level will be read from the configuration file.
         '''
         startupconf = config.readStartupConfig(fn, root)
-     
+
         if debuglevel != None:
             startupconf.debuglevel = debuglevel
         if errorlevel != None:
@@ -166,7 +166,7 @@
                 reposlist.append(thisrepo)
 
         # Read .repo files from directories specified by the reposdir option
-        # (typically /etc/yum.repos.d and /etc/yum/repos.d)
+        # (typically /etc/yum/repos.d)
         parser = ConfigParser()
         for reposdir in self.conf.reposdir:
             if os.path.exists(self.conf.installroot+'/'+reposdir):

Index: config.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/config.py,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- config.py	8 Jan 2007 19:17:44 -0000	1.109
+++ config.py	27 Jan 2007 03:04:49 -0000	1.110
@@ -476,7 +476,7 @@
     cachedir = Option('/var/cache/yum')
     keepcache = BoolOption(True)
     logfile = Option('/var/log/yum.log')
-    reposdir = ListOption(['/etc/yum/repos.d', '/etc/yum.repos.d'])
+    reposdir = ListOption(['/etc/yum/repos.d'])
     syslog_ident = Option()
     syslog_facility = Option('LOG_DAEMON')
 
@@ -672,7 +672,7 @@
     return releasever
 
 #def main():
-#    mainconf = readMainConfig('/etc/yum.conf', '/') 
+#    mainconf = readMainConfig('/etc/yum/yum.conf', '/')
 #    repoconf = readRepoConfig(mainconf.cfg, 'core', mainconf)
 #
 #    print `repoconf.name`