[yum-cvs] yum-utils package-cleanup.py,1.4,1.5

[Seth Vidal]

Update of /home/groups/yum/cvs/yum-utils
In directory login:/tmp/cvs-serv13110

Modified Files:
	package-cleanup.py 
Log Message:

various cleanups and edits


Index: package-cleanup.py
===================================================================
RCS file: /home/groups/yum/cvs/yum-utils/package-cleanup.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- package-cleanup.py	13 Jun 2005 00:15:40 -0000	1.4
+++ package-cleanup.py	13 Jun 2005 01:53:28 -0000	1.5
@@ -50,8 +50,9 @@
     my.localPackages = []
     return my
 
-# Get a list of all requirements in the local rpmdb
+
 def getLocalRequires(my):
+    """Get a list of all requirements in the local rpmdb"""
     pkgs = {}
     for header in my.rpmdb.getHdrList():
         tup = my.rpmdb._hdr2pkgTuple(header)
@@ -63,9 +64,10 @@
         pkgs[tup] = requires
     return pkgs
 
-# Resolve all dependencies in pkgs and build a dictionary of packages
-# that provide something for a package other than itself
-def buildProviderList(my,pkgs,reportProblems):
+def buildProviderList(my, pkgs, reportProblems):
+    """Resolve all dependencies in pkgs and build a dictionary of packages
+     that provide something for a package other than itself"""
+
     errors = False
     providers = {} # To speed depsolving, don't recheck deps that have 
                    # already been checked
@@ -77,13 +79,13 @@
             rflags = flags & 15
             if req.startswith('rpmlib'): continue # ignore rpmlib deps
             
-            if (not providers.has_key((req,rflags,ver))):
+            if not providers.has_key((req,rflags,ver)):
                 resolve_sack = my.rpmdb.whatProvides(req,rflags,ver)
             else:
                 resolve_sack = providers[(req,rflags,ver)]
                 
             if len(resolve_sack) < 1 and reportProblems:
-                if (not errors):
+                if not errors:
                     print "Missing dependencies:"
                 errors = True
                 print "Package %s requires %s" % (pkg[0],
@@ -97,7 +99,7 @@
                 # Store the resolve_sack so that we can re-use it if another
                 # package has the same requirement
                 providers[(req,rflags,ver)] = resolve_sack
-    if (not errors and reportProblems):
+    if not errors and reportProblems:
         print "No problems found"
     return provsomething
 
@@ -145,9 +147,10 @@
     else:            
         return True
     
-# Remove old kernels, keep at most count kernels (and always keep the running
-# kernel)
 def removeKernels(my, count):
+    """Remove old kernels, keep at most count kernels (and always keep the running
+     kernel"""
+
     count = int(count)
     if count < 1:
         print "Error should keep at least 1 kernel!"
@@ -160,6 +163,7 @@
         return
     remove = kernels[count:]
     toremove = []
+    
     # Remove running kernel from remove list
     for kernel in remove:
         (n,a,e,v,r) = kernel