rpms/yum/devel yum-2.4.1-clean-cookies.patch, NONE, 1.1 yum.conf.fedora, 1.13, 1.14 yum.spec, 1.62, 1.63
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Dec 5 16:05:14 UTC 2005
- Previous message (by thread): 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
- Next message (by thread): rpms/mkinitrd/devel .cvsignore, 1.82, 1.83 mkinitrd.spec, 1.89, 1.90 sources, 1.87, 1.88
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: katzj
Update of /cvs/dist/rpms/yum/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32102
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-2
- add Panu's patch for cachecookie cleaning (#174715)
- change default cache time to 30 minutes to match new upstream
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/devel/yum.conf.fedora,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- yum.conf.fedora 7 Nov 2005 17:58:01 -0000 1.13
+++ yum.conf.fedora 5 Dec 2005 16:05:00 -0000 1.14
@@ -9,6 +9,7 @@
obsoletes=1
gpgcheck=1
plugins=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/devel/yum.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- yum.spec 1 Dec 2005 00:50:01 -0000 1.62
+++ yum.spec 5 Dec 2005 16:05:00 -0000 1.63
@@ -3,7 +3,7 @@
Summary: RPM installer/updater
Name: yum
Version: 2.4.1
-Release: 1
+Release: 2
License: GPL
Group: System Environment/Base
Source0: http://linux.duke.edu/projects/yum/download/2.4/yum-%{version}.tar.gz
@@ -106,6 +106,10 @@
/usr/lib/yum-plugins/*
%changelog
+* Mon Dec 5 2005 Jeremy Katz <katzj at redhat.com> - 2.4.1-2
+- add Panu's patch for cachecookie cleaning (#174715)
+- change default cache time to 30 minutes to match new upstream
+
* Wed Nov 30 2005 Jeremy Katz <katzj at redhat.com> - 2.4.1-1
- update to 2.4.1
- add PLUGINS to the docs
- Previous message (by thread): 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
- Next message (by thread): rpms/mkinitrd/devel .cvsignore, 1.82, 1.83 mkinitrd.spec, 1.89, 1.90 sources, 1.87, 1.88
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list