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

[Seth Vidal]

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

Modified Files:
	package-cleanup.py 
Log Message:

add in a -y to allow removing kernels 'automatically'


Index: package-cleanup.py
===================================================================
RCS file: /home/groups/yum/cvs/yum-utils/package-cleanup.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- package-cleanup.py	13 Jun 2005 01:53:28 -0000	1.5
+++ package-cleanup.py	13 Jun 2005 02:05:40 -0000	1.6
@@ -147,7 +147,7 @@
     else:            
         return True
     
-def removeKernels(my, count):
+def removeKernels(my, count, confirmed):
     """Remove old kernels, keep at most count kernels (and always keep the running
      kernel"""
 
@@ -183,8 +183,9 @@
         (n,a,e,v,r) = kernel
         print "%s-%s" % (v,r) 
 
-    if (not userconfirm()):
-        sys.exit(0)
+    if not confirmed:
+        if not userconfirm():
+            sys.exit(0)
 
     for kernel in toremove:
         hdr = my.rpmdb.returnHeaderByTuple(kernel)[0]
@@ -208,6 +209,8 @@
       help='When listing leaf nodes also list leaf nodes that are not libraries')
     parser.add_option("-q", "--quiet", default=False, dest="quiet",action="store_true",
       help='Print out nothing unecessary')
+    parser.add_option("-y", default=False, dest="confirmed",action="store_true",
+      help='Agree to anything asked')
     parser.add_option("--oldkernels", default=False, dest="kernels",action="store_true",
       help="Remove old kernels")
     parser.add_option("--count",default=2,dest="kernelcount",action="store",
@@ -226,7 +229,10 @@
     my = initYum()
     
     if (opts.kernels):
-        removeKernels(my, opts.kernelcount)
+        if os.geteuid() != 0:
+            print "Error: Cannot remove kernels as a user, must be root"
+            sys.exit(1)
+        removeKernels(my, opts.kernelcount, opts.confirmed)
         sys.exit(0)
     
     if (opts.leaves):