rpms/yum/FC-4 yum-2.4.1-clean-cookies.patch, NONE, 1.1 yum.conf.fedora, 1.12, 1.13 yum.spec, 1.45, 1.46

[fedora-cvs-commits at redhat.com]

Author: katzj

Update of /cvs/dist/rpms/yum/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv31972

Modified Files:
	yum.conf.fedora yum.spec 
Added Files:
	yum-2.4.1-clean-cookies.patch 
Log Message:
* Mon Dec  5 2005 Jeremy Katz <katzj at redhat.com> - 2.4.1-1.fc4
- add Panu's patch for clean all getting the cache cookie (#174715)
- change default cache timeout to 30 minutes (new upstream default)


yum-2.4.1-clean-cookies.patch:
 cli.py          |    2 ++
 yum/__init__.py |    2 +-
 yum/config.py   |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE yum-2.4.1-clean-cookies.patch ---
Index: cli.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/cli.py,v
retrieving revision 1.189
diff -u -r1.189 cli.py
--- cli.py	14 Jul 2005 08:32:51 -0000	1.189
+++ cli.py	1 Dec 2005 19:42:41 -0000
@@ -610,6 +610,8 @@
             self.log(2, "This may take a while depending on the speed of this computer")
             self.log(3, '%s' % self.pickleRecipe())
             try:
+                for repo in self.repos.findRepos('*'):
+                    repo.metadata_expire = 0
                 self.doRepoSetup(dosack=0)
                 self.repos.populateSack(with='metadata', pickleonly=1)
                 self.repos.populateSack(with='filelists', pickleonly=1)
Index: yum/__init__.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/__init__.py,v
retrieving revision 1.135.2.3
diff -u -r1.135.2.3 __init__.py
--- yum/__init__.py	30 Nov 2005 20:04:26 -0000	1.135.2.3
+++ yum/__init__.py	1 Dec 2005 19:42:42 -0000
@@ -837,7 +837,7 @@
 
     def cleanMetadata(self):
         filelist = []
-        exts = ['xml.gz', 'xml']
+        exts = ['xml.gz', 'xml', 'cachecookie']
         
         removed = 0
         for ext in exts:
Index: yum/config.py
diff -u yum/config.py:1.72.2.4 yum/yum/config.py:1.72.2.5
--- yum/config.py:1.72.2.4	Sun Nov 27 17:07:55 2005
+++ yum/config.py	Sat Dec  3 02:15:04 2005
@@ -201,7 +201,7 @@
                       ('errorlevel', 2), 
                       ('retries', 10),
                       ('recent', 7),
-                      ('metadata_expire', 28800)]
+                      ('metadata_expire', 1800)]
                       
                       
         #defaults -either get them or set them


Index: yum.conf.fedora
===================================================================
RCS file: /cvs/dist/rpms/yum/FC-4/yum.conf.fedora,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- yum.conf.fedora	25 Jan 2005 14:36:02 -0000	1.12
+++ yum.conf.fedora	5 Dec 2005 16:03:12 -0000	1.13
@@ -9,6 +9,7 @@
 retries=20
 obsoletes=1
 gpgcheck=1
+metadata_expire=1800
 
 # PUT YOUR REPOS HERE OR IN separate files named file.repo
 # in /etc/yum.repos.d


Index: yum.spec
===================================================================
RCS file: /cvs/dist/rpms/yum/FC-4/yum.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- yum.spec	30 Nov 2005 22:29:39 -0000	1.45
+++ yum.spec	5 Dec 2005 16:03:12 -0000	1.46
@@ -1,11 +1,12 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 2.4.1
-Release: 0.fc4
+Release: 1.fc4
 License: GPL
 Group: System Environment/Base
 Source0: http://linux.duke.edu/projects/yum/download/2.4/yum-%{version}.tar.gz
 Source1: yum.conf.fedora
+Patch0: yum-2.4.1-clean-cookies.patch
 URL: http://linux.duke.edu/yum/
 BuildArchitectures: noarch
 BuildRequires: python
@@ -25,6 +26,7 @@
 
 %prep
 %setup -q -n yum-%{version}
+%patch0 -p0
 
 %build
 make
@@ -72,6 +74,10 @@
 %{_mandir}/man*/*
 
 %changelog
+* Mon Dec  5 2005 Jeremy Katz <katzj at redhat.com> - 2.4.1-1.fc4
+- add Panu's patch for clean all getting the cache cookie (#174715)
+- change default cache timeout to 30 minutes (new upstream default)
+
 * Wed Nov 30 2005 Jeremy Katz <katzj at redhat.com> - 2.4.1-0.fc4
 - update to 2.4.1