r5593 - trunk/gnue-common/src/apps

[jcater]

Author: jcater
Date: 2004-03-31 10:13:06 -0600 (Wed, 31 Mar 2004)
New Revision: 5593

Modified:
   trunk/gnue-common/src/apps/GBaseApp.py
Log:
do not assume -u is for username, since clients can use it

Modified: trunk/gnue-common/src/apps/GBaseApp.py
===================================================================
--- trunk/gnue-common/src/apps/GBaseApp.py      2004-03-31 14:05:04 UTC (rev 
5592)
+++ trunk/gnue-common/src/apps/GBaseApp.py      2004-03-31 16:13:06 UTC (rev 
5593)
@@ -117,7 +117,7 @@
     if self.USE_DATABASE_OPTIONS:
       self.USE_CONNECTIONS = 1
       self._base_options += [
-        [ 'username', 'u', 'username', True, '', 'name',
+        [ 'username', None, 'username', True, '', 'name',
            _('Username used to log into the database.  Note that if '
              'specified, this will be used for all databases.  If not '
              'supplied, the program will prompt for username.')],
@@ -173,7 +173,7 @@
 
 
     # mod_python apps don't have an argv
-    # so create an empty one. 
+    # so create an empty one.
     # TODO: This class needs adjusted to
     #       be more efficent in mod_python cases
     #       But not this close to a release :)
@@ -184,7 +184,7 @@
       opt, self.ARGUMENTS = getopt.getopt(sys.argv[1:], shortoptions, 
longoptions)
     except getopt.error, msg:
       self.handleStartupError(msg)
-        
+
     for o in opt:
       if len(o[1]):
         self.OPTIONS[lookup[o[0]]] = o[1]
@@ -517,7 +517,7 @@
     print "Man file create: %s.1" % self.COMMAND
 
   #
-  # Converts a 
+  # Converts a
   #
   def getCommandLineParameters(self,paramList):
     parameters = {}
@@ -531,7 +531,7 @@
       GDebug.printMesg(2,'Param "%s"="%s" ' % \
                          (string.lower(psplit[0]), psplit[1]))
     return parameters
-                                
+
   #
   #  Display a startup error and exit gracefully with a message on
   #  how to get help