[yum-cvs] yum cli.py,1.202,1.203

[Seth Vidal]

Update of /home/groups/yum/cvs/yum
In directory login1.linux.duke.edu:/tmp/cvs-serv19464

Modified Files:
	cli.py 
Log Message:

1. get rid of unnecessary print_short_help method on our optparser object
   - just use print_usage
2. fix silly 'None' Output in usage as reported by Luke.



Index: cli.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/cli.py,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- cli.py	13 Dec 2005 07:35:13 -0000	1.202
+++ cli.py	13 Dec 2005 08:45:18 -0000	1.203
@@ -43,7 +43,7 @@
 import urlgrabber.grabber
 
 class CliError(yum.Errors.YumBaseError):
-   def __init__(self, args=None):
+   def __init__(self, args=''):
         yum.Errors.YumBaseError.__init__(self)
         self.args = args
 
@@ -1409,9 +1409,11 @@
         '''Print out command line usage
         '''
         if not self.in_shell:
-            print self.optparser.print_help()
+            print 
+            self.optparser.print_help()
         else:
-            print self.optparser.print_short_help()
+            print 
+            self.optparser.print_usage()
             
             
             
@@ -1432,17 +1434,6 @@
         self.base.errorlog(0, "Command line error: "+msg)
         sys.exit(1)
 
-    def print_short_help(self):
-        '''print a shorter help - mostly for use in the shell'''
-        
-        msg="""
-    usage: yum [options] < update | install | info | remove | list |
-           clean | provides | search | check-update | groupinstall |
-           groupupdate | grouplist | groupinfo | groupremove |
-           makecache | localinstall | erase | upgrade | whatprovides |
-           localupdate | resolvedep | shell | deplist >
-    """
-        return msg
 
         
 def _filtercmdline(novalopts, valopts, args):