rpms/yum/devel rpmdb-cache-BIG-post-releasever.path, 1.1, 1.2 yum.spec, 1.284, 1.285

[James Antill]

Author: james

Update of /cvs/pkgs/rpms/yum/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7234

Modified Files:
	rpmdb-cache-BIG-post-releasever.path yum.spec 
Log Message:
* Fri Dec  4 2009 James Antill <james at fedoraproject.org> - 3.2.25-3
- Fixes for yum clean all, BZ 544173



Index: rpmdb-cache-BIG-post-releasever.path
===================================================================
RCS file: /cvs/pkgs/rpms/yum/devel/rpmdb-cache-BIG-post-releasever.path,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- rpmdb-cache-BIG-post-releasever.path	3 Dec 2009 15:07:05 -0000	1.1
+++ rpmdb-cache-BIG-post-releasever.path	4 Dec 2009 13:35:00 -0000	1.2
@@ -924,3 +924,48 @@ index b809216..f123c16 100644
              for group in groups:
                  if group not in extcmds[1:]:
                      continue
+commit 8bd4293b0ad62b302df415b5d09dd670e68e504a
+Author: James Antill <james at and.org>
+Date:   Fri Dec 4 08:27:01 2009 -0500
+
+     Fixes for clean functions, BZ 544173
+    
+     When nothing to be done, set removed.
+     When doing "clean all" fix the var. name.
+     When doing anything but clean rpmdb, fix the return.
+
+diff --git a/cli.py b/cli.py
+index f93a706..2c6c9a4 100644
+--- a/cli.py
++++ b/cli.py
+@@ -897,7 +897,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
+             rpmcode, rpmresults = self.cleanRpmDB()
+             self.plugins.run('clean')
+             
+-            code = hdrcode + pkgcode + xmlcode + dbcode + rpmdb
++            code = hdrcode + pkgcode + xmlcode + dbcode + rpmcode
+             results = (hdrresults + pkgresults + xmlresults + dbresults +
+                        rpmresults)
+             for msg in results:
+diff --git a/yum/__init__.py b/yum/__init__.py
+index affa92b..1c82144 100644
+--- a/yum/__init__.py
++++ b/yum/__init__.py
+@@ -1714,15 +1714,15 @@ class YumBase(depsolve.Depsolve):
+ 
+     def _cleanFiles(self, exts, pathattr, filetype):
+         filelist = []
+-        removed = 0
+         for ext in exts:
+             for repo in self.repos.listEnabled():
+                 path = getattr(repo, pathattr)
+                 if os.path.exists(path) and os.path.isdir(path):
+                     filelist = misc.getFileList(path, ext, filelist)
+-        self._cleanFilelist(filetype, filelist)
++        return self._cleanFilelist(filetype, filelist)
+ 
+     def _cleanFilelist(self, filetype, filelist):
++        removed = 0
+         for item in filelist:
+             try:
+                 misc.unlink_f(item)


Index: yum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum/devel/yum.spec,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -p -r1.284 -r1.285
--- yum.spec	3 Dec 2009 15:07:06 -0000	1.284
+++ yum.spec	4 Dec 2009 13:35:00 -0000	1.285
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.2.25
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz
@@ -112,6 +112,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/lib/yum-plugins
 
 %changelog
+* Fri Dec  4 2009 James Antill <james at fedoraproject.org> - 3.2.25-3
+- Fixes for yum clean all, BZ 544173
+
 * Thu Dec  3 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.25-2
 - rebuild yum with latest HEAD patch
 - add rpmdb caching patch james wrote to see if it breaks everyone :)