[yum-cvs] yum cli.py, 1.247, 1.248 yum-updatesd.py, 1.33, 1.34 yum.spec, 1.84, 1.85 yummain.py, 1.103, 1.104

[James Bowes]

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

Modified Files:
	cli.py yum-updatesd.py yum.spec yummain.py 
Log Message:
Store all config files under /etc/yum, with no fallback.

Index: cli.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/cli.py,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -r1.247 -r1.248
--- cli.py	7 Dec 2006 23:25:56 -0000	1.247
+++ cli.py	27 Jan 2007 03:04:48 -0000	1.248
@@ -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.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- yum-updatesd.py	22 Jan 2007 19:22:32 -0000	1.33
+++ yum-updatesd.py	27 Jan 2007 03:04:48 -0000	1.34
@@ -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 UpdateBuildTransactionThread(threading.Thread):

Index: yum.spec
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- yum.spec	21 Jan 2007 20:23:30 -0000	1.84
+++ yum.spec	27 Jan 2007 03:04:49 -0000	1.85
@@ -46,7 +46,7 @@
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-# install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/yum.conf
+# install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/yum/yum.conf
 # install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.daily/yum.cron
 
 %clean
@@ -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.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- yummain.py	19 Dec 2006 03:43:31 -0000	1.103
+++ yummain.py	27 Jan 2007 03:04:49 -0000	1.104
@@ -183,7 +183,7 @@
     unlock()
     sys.exit(0)
 
-    
+
 if __name__ == "__main__":
     #import hotshot
     #p = hotshot.Profile(os.path.expanduser("~/yum.prof"))