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

[James Antill]

Author: james

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

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-4
- Fixes for yum clean all, BZ 544173
- Also allow "yum clean rpmdb" to work, bad tester, bad.



Index: rpmdb-cache-BIG-post-releasever.path
===================================================================
RCS file: /cvs/pkgs/rpms/yum/devel/rpmdb-cache-BIG-post-releasever.path,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- rpmdb-cache-BIG-post-releasever.path	4 Dec 2009 13:35:00 -0000	1.2
+++ rpmdb-cache-BIG-post-releasever.path	4 Dec 2009 14:26:31 -0000	1.3
@@ -924,7 +924,7 @@ index b809216..f123c16 100644
              for group in groups:
                  if group not in extcmds[1:]:
                      continue
-commit 8bd4293b0ad62b302df415b5d09dd670e68e504a
+commit 366c3e6bb9ebd7ad3f121bdf2c089b0132d51604
 Author: James Antill <james at and.org>
 Date:   Fri Dec 4 08:27:01 2009 -0500
 
@@ -933,6 +933,8 @@ Date:   Fri Dec 4 08:27:01 2009 -0500
      When nothing to be done, set removed.
      When doing "clean all" fix the var. name.
      When doing anything but clean rpmdb, fix the return.
+     Allow rpmdb as a valid arg.
+     Fix getFileList() with ext == ''
 
 diff --git a/cli.py b/cli.py
 index f93a706..2c6c9a4 100644
@@ -969,3 +971,29 @@ index affa92b..1c82144 100644
          for item in filelist:
              try:
                  misc.unlink_f(item)
+diff --git a/yum/misc.py b/yum/misc.py
+index 642f9a2..f221f1d 100644
+--- a/yum/misc.py
++++ b/yum/misc.py
+@@ -336,7 +336,7 @@ def getFileList(path, ext, filelist):
+         if os.path.isdir(path + '/' + d):
+             filelist = getFileList(path + '/' + d, ext, filelist)
+         else:
+-            if d[-extlen:].lower() == '%s' % (ext):
++            if not ext or d[-extlen:].lower() == '%s' % (ext):
+                 newpath = os.path.normpath(path + '/' + d)
+                 filelist.append(newpath)
+                     
+diff --git a/yumcommands.py b/yumcommands.py
+index 83d9d00..4fe2fe1 100644
+--- a/yumcommands.py
++++ b/yumcommands.py
+@@ -85,7 +85,7 @@ def checkGroupArg(base, basecmd, extcmds):
+ 
+ def checkCleanArg(base, basecmd, extcmds):
+     VALID_ARGS = ('headers', 'packages', 'metadata', 'dbcache', 'plugins',
+-                  'expire-cache', 'all')
++                  'expire-cache', 'rpmdb', 'all')
+ 
+     if len(extcmds) == 0:
+         base.logger.critical(_('Error: clean requires an option: %s') % (


Index: yum.spec
===================================================================
RCS file: /cvs/pkgs/rpms/yum/devel/yum.spec,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -p -r1.285 -r1.286
--- yum.spec	4 Dec 2009 13:35:00 -0000	1.285
+++ yum.spec	4 Dec 2009 14:26:31 -0000	1.286
@@ -3,7 +3,7 @@
 Summary: RPM installer/updater
 Name: yum
 Version: 3.2.25
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz
@@ -112,8 +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
+* Fri Dec  4 2009 James Antill <james at fedoraproject.org> - 3.2.25-4
 - Fixes for yum clean all, BZ 544173
+- Also allow "yum clean rpmdb" to work, bad tester, bad.
 
 * Thu Dec  3 2009 Seth Vidal <skvidal at fedoraproject.org> - 3.2.25-2
 - rebuild yum with latest HEAD patch