[yum-cvs] yum/yum __init__.py, 1.259.2.11, 1.259.2.12 config.py, 1.105.2.4, 1.105.2.5

[James Bowes]

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

Modified Files:
      Tag: yum-3_0_X
	__init__.py config.py 
Log Message:
Store all config files under /etc/yum. Fallback to the old locations if needed.

Index: __init__.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/__init__.py,v
retrieving revision 1.259.2.11
retrieving revision 1.259.2.12
diff -u -r1.259.2.11 -r1.259.2.12
--- __init__.py	7 Jan 2007 20:07:55 -0000	1.259.2.11
+++ __init__.py	27 Jan 2007 03:05:37 -0000	1.259.2.12
@@ -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):
         '''
@@ -109,8 +109,15 @@
         @param errorlevel: Error level to use for logging. If None, the debug
             level will be read from the configuration file.
         '''
+
+        # TODO: Remove this block when we no longer support configs outside
+        # of /etc/yum/
+        if fn == '/etc/yum/yum.conf' and not os.path.exists(fn):
+            # Try the old default
+            fn = '/etc/yum.conf'
+
         startupconf = config.readStartupConfig(fn, root)
-     
+
         if debuglevel != None:
             startupconf.debuglevel = debuglevel
         if errorlevel != None:

Index: config.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/config.py,v
retrieving revision 1.105.2.4
retrieving revision 1.105.2.5
diff -u -r1.105.2.4 -r1.105.2.5
--- config.py	8 Jan 2007 19:18:15 -0000	1.105.2.4
+++ config.py	27 Jan 2007 03:05:37 -0000	1.105.2.5
@@ -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`