[yum-cvs] yum cli.py, 1.241.2.9, 1.241.2.10 yum-updatesd.py, 1.22.2.10, 1.22.2.11 yum.spec, 1.83.2.4, 1.83.2.5

[James Bowes]

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

Modified Files:
      Tag: yum-3_0_X
	cli.py yum-updatesd.py yum.spec 
Log Message:
Go back to using the old config file locations, but support the new ones as well

Index: cli.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/cli.py,v
retrieving revision 1.241.2.9
retrieving revision 1.241.2.10
diff -u -r1.241.2.9 -r1.241.2.10
--- cli.py	27 Jan 2007 03:05:37 -0000	1.241.2.9
+++ cli.py	31 Jan 2007 01:53:50 -0000	1.241.2.10
@@ -131,7 +131,7 @@
                 action="store_true", default=False,
                 help="run entirely from cache, don't update cache")
         self.optparser.add_option("-c", "", dest="conffile", action="store", 
-                default='/etc/yum/yum.conf', help="config file location",
+                default='/etc/yum.conf', help="config file location",
                 metavar=' [config file]')
         self.optparser.add_option("-R", "", dest="sleeptime", action="store",
                 type='int', default=None, help="maximum command wait time",

Index: yum-updatesd.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum-updatesd.py,v
retrieving revision 1.22.2.10
retrieving revision 1.22.2.11
diff -u -r1.22.2.10 -r1.22.2.11
--- yum-updatesd.py	27 Jan 2007 03:05:37 -0000	1.22.2.10
+++ yum-updatesd.py	31 Jan 2007 01:53:50 -0000	1.22.2.11
@@ -235,7 +235,7 @@
     syslog_facility = Option("DAEMON")
     syslog_level = Option("WARN")
     syslog_ident = Option("yum-updatesd")
-    yum_config = Option("/etc/yum/yum.conf")
+    yum_config = Option("/etc/yum.conf")
 
 class UpdateDownloadThread(threading.Thread):
     def __init__(self, updd, dlpkgs):

Index: yum.spec
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum.spec,v
retrieving revision 1.83.2.4
retrieving revision 1.83.2.5
diff -u -r1.83.2.4 -r1.83.2.5
--- yum.spec	27 Jan 2007 03:05:37 -0000	1.83.2.4
+++ yum.spec	31 Jan 2007 01:53:50 -0000	1.83.2.5
@@ -68,9 +68,9 @@
 %files
 %defattr(-, root, root)
 %doc README AUTHORS COPYING TODO INSTALL ChangeLog PLUGINS
-%config(noreplace) %{_sysconfdir}/yum/yum.conf
+%config(noreplace) %{_sysconfdir}/yum.conf
+%dir %{_sysconfdir}/yum.repos.d
 %dir %{_sysconfdir}/%{name}
-%dir %{_sysconfdir}/yum/repos.d
 %config %{_sysconfdir}/logrotate.d/%{name}
 %{_datadir}/yum-cli/*
 %{_bindir}/yum