[yum-cvs] yum cli.py, 1.241.2.8, 1.241.2.9 yum-updatesd.py, 1.22.2.9, 1.22.2.10 yum.spec, 1.83.2.3, 1.83.2.4 yummain.py, 1.100.2.3, 1.100.2.4

[James Bowes]

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

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

Index: cli.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/cli.py,v
retrieving revision 1.241.2.8
retrieving revision 1.241.2.9
diff -u -r1.241.2.8 -r1.241.2.9
--- cli.py	7 Dec 2006 23:25:32 -0000	1.241.2.8
+++ cli.py	27 Jan 2007 03:05:37 -0000	1.241.2.9
@@ -128,12 +128,12 @@
         self.optparser.add_option("-t", "--tolerant", dest="tolerant",
                 action="store_true", default=False, help="be tolerant of errors")
         self.optparser.add_option("-C", "", dest="cacheonly",
-                action="store_true", default=False, 
+                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.conf', help="config file location", 
+                default='/etc/yum/yum.conf', help="config file location",
                 metavar=' [config file]')
-        self.optparser.add_option("-R", "", dest="sleeptime", action="store", 
+        self.optparser.add_option("-R", "", dest="sleeptime", action="store",
                 type='int', default=None, help="maximum command wait time",
                 metavar=' [minutes]')
         self.optparser.add_option("-d", "", dest="debuglevel", action="store", 

Index: yum-updatesd.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum-updatesd.py,v
retrieving revision 1.22.2.9
retrieving revision 1.22.2.10
diff -u -r1.22.2.9 -r1.22.2.10
--- yum-updatesd.py	19 Dec 2006 03:48:56 -0000	1.22.2.9
+++ yum-updatesd.py	27 Jan 2007 03:05:37 -0000	1.22.2.10
@@ -235,7 +235,7 @@
     syslog_facility = Option("DAEMON")
     syslog_level = Option("WARN")
     syslog_ident = Option("yum-updatesd")
-    yum_config = Option("/etc/yum.conf")
+    yum_config = Option("/etc/yum/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.3
retrieving revision 1.83.2.4
diff -u -r1.83.2.3 -r1.83.2.4
--- yum.spec	7 Jan 2007 20:07:54 -0000	1.83.2.3
+++ yum.spec	27 Jan 2007 03:05:37 -0000	1.83.2.4
@@ -68,9 +68,9 @@
 %files
 %defattr(-, root, root)
 %doc README AUTHORS COPYING TODO INSTALL ChangeLog PLUGINS
-%config(noreplace) %{_sysconfdir}/yum.conf
-%dir %{_sysconfdir}/yum.repos.d
+%config(noreplace) %{_sysconfdir}/yum/yum.conf
 %dir %{_sysconfdir}/%{name}
+%dir %{_sysconfdir}/yum/repos.d
 %config %{_sysconfdir}/logrotate.d/%{name}
 %{_datadir}/yum-cli/*
 %{_bindir}/yum

Index: yummain.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yummain.py,v
retrieving revision 1.100.2.3
retrieving revision 1.100.2.4
diff -u -r1.100.2.3 -r1.100.2.4
--- yummain.py	19 Dec 2006 03:48:56 -0000	1.100.2.3
+++ yummain.py	27 Jan 2007 03:05:37 -0000	1.100.2.4
@@ -183,12 +183,12 @@
     unlock()
     sys.exit(0)
 
-    
+
 if __name__ == "__main__":
-    #import hotshot
-    #p = hotshot.Profile(os.path.expanduser("~/yum.prof"))
-    #p.run('main(sys.argv[1:])')
-    #p.close()    
+    import hotshot
+    p = hotshot.Profile("yum.prof")
+    p.run('main(sys.argv[1:])')
+    p.close()    
     try:
         main(sys.argv[1:])
     except KeyboardInterrupt, e: