Changeset 2512 for pykota/trunk/bin/edpykota

Timestamp:

09/27/05 20:34:31 (19 years ago)

Author:

jerome

Message:

Ensure that human made errors (like incorrect command line options)
don't produce a traceback anymore. No need to frighten users with
such complete tracebacks and email reporting each time they mistype
some command.
Makes pykosd check more carefully the values of its command line options.

Files:

• pykota/trunk/bin/edpykota (modified) (13 diffs)

pykota/trunk/bin/edpykota

@@ -29 +29 @@
 import pwd
 import grp
-from pykota.tool import PyKotaTool, PyKotaToolError, crashed, N_
+from pykota.tool import PyKotaTool, PyKotaToolError, PyKotaCommandLineError, crashed, N_
 from pykota.config import PyKotaConfigError
 from pykota.storage import PyKotaStorageError
@@ -246 +246 @@
         """Edit user or group quotas."""
         if not self.config.isAdmin :
-            raise PyKotaToolError, "%s : %s" % (pwd.getpwuid(os.geteuid())[0], _("You're not allowed to use this command."))
+            raise PyKotaCommandLineError, "%s : %s" % (pwd.getpwuid(os.geteuid())[0], _("You're not allowed to use this command."))
         
         suffix = (options["groups"] and "Group") or "User"        
@@ -261 +261 @@
             if limitby not in ('quota', 'balance', 'noquota', \
                                         'noprint', 'nochange') :
-                raise PyKotaToolError, _("Invalid limitby value %s") % options["limitby"]
+                raise PyKotaCommandLineError, _("Invalid limitby value %s") % options["limitby"]
             if limitby in ('noquota', 'nochange') :    
                 options["noquota"] = 1
             if (limitby in ('nochange', 'noprint')) and options["groups"] :    
-                raise PyKotaToolError, _("Invalid limitby value %s") % options["limitby"]
+                raise PyKotaCommandLineError, _("Invalid limitby value %s") % options["limitby"]
 
         used = options["used"]
@@ -273 +273 @@
                 int(used)
             except ValueError :
-                raise PyKotaToolError, _("Invalid used value %s.") % used
+                raise PyKotaCommandLineError, _("Invalid used value %s.") % used
                 
         increase = options["increase"]
@@ -280 +280 @@
                 increase = int(increase.strip())
             except ValueError :
-                raise PyKotaToolError, _("Invalid increase value %s.") % increase
+                raise PyKotaCommandLineError, _("Invalid increase value %s.") % increase
 
         if not options["noquota"] :
@@ -289 +289 @@
                         raise ValueError
                 except ValueError :    
-                    raise PyKotaToolError, _("Invalid softlimit value %s.") % options["softlimit"]
+                    raise PyKotaCommandLineError, _("Invalid softlimit value %s.") % options["softlimit"]
             if options["hardlimit"] :
                 try :
@@ -296 +296 @@
                         raise ValueError
                 except ValueError :    
-                    raise PyKotaToolError, _("Invalid hardlimit value %s.") % options["hardlimit"]
+                    raise PyKotaCommandLineError, _("Invalid hardlimit value %s.") % options["hardlimit"]
             if (softlimit is not None) and (hardlimit is not None) and (hardlimit < softlimit) :        
                 # error, exchange them
@@ -307 +307 @@
                 overcharge = float(overcharge.strip())
             except (ValueError, AttributeError) :    
-                raise PyKotaToolError, _("Invalid overcharge value %s") % options["overcharge"]
+                raise PyKotaCommandLineError, _("Invalid overcharge value %s") % options["overcharge"]
                 
         balance = options["balance"]
@@ -315 +315 @@
                 balancevalue = float(balance)
             except ValueError :    
-                raise PyKotaToolError, _("Invalid balance value %s") % options["balance"]
+                raise PyKotaCommandLineError, _("Invalid balance value %s") % options["balance"]
             
         if options["charge"] :
@@ -321 +321 @@
                 charges = [float(part) for part in options["charge"].split(',', 1)]
             except ValueError :    
-                raise PyKotaToolError, _("Invalid charge amount value %s") % options["charge"]
+                raise PyKotaCommandLineError, _("Invalid charge amount value %s") % options["charge"]
             else :    
                 if len(charges) > 2 :
@@ -346 +346 @@
                         raise PyKotaToolError, _("Impossible to add printer %s") % pname
                 else :    
-                    raise PyKotaToolError, _("Invalid printer name %s") % pname
+                    raise PyKotaCommandLineError, _("Invalid printer name %s") % pname
             else :
-                raise PyKotaToolError, _("There's no printer matching %s") % pname
+                raise PyKotaCommandLineError, _("There's no printer matching %s") % pname
         if not names :    
             if options["delete"] :    
-                raise PyKotaToolError, _("You have to pass user or group names on the command line")
+                raise PyKotaCommandLineError, _("You have to pass user or group names on the command line")
             else :
                 names = getattr(self.storage, "getAll%ssNames" % suffix)() # all users or groups
@@ -362 +362 @@
             protoentry = getattr(self.storage, "get%s" % suffix)(options["prototype"])
             if not protoentry.Exists :
-                raise PyKotaToolError, _("Prototype object %s not found in Quota Storage.") % protoentry.Name
+                raise PyKotaCommandLineError, _("Prototype object %s not found in Quota Storage.") % protoentry.Name
             else :    
                 limitby = protoentry.LimitBy
@@ -598 +598 @@
             editor.display_version_and_quit()
         elif options["users"] and options["groups"] :    
-            raise PyKotaToolError, _("incompatible options, see help.")
+            raise PyKotaCommandLineError, _("incompatible options, see help.")
         elif (options["add"] or options["prototype"]) and options["delete"] :    
-            raise PyKotaToolError, _("incompatible options, see help.")
+            raise PyKotaCommandLineError, _("incompatible options, see help.")
         elif (options["reset"] or options["hardreset"] or options["limitby"] or options["used"] or options["balance"] or options["overcharge"] or options["softlimit"] or options["hardlimit"]) and options["prototype"] :
-            raise PyKotaToolError, _("incompatible options, see help.")
+            raise PyKotaCommandLineError, _("incompatible options, see help.")
         elif options["noquota"] and (options["prototype"] or options["hardlimit"] or options["softlimit"]) :
-            raise PyKotaToolError, _("incompatible options, see help.")
+            raise PyKotaCommandLineError, _("incompatible options, see help.")
         elif options["groups"] and (options["balance"] or options["ingroups"] or options["used"] or options["overcharge"]) :
-            raise PyKotaToolError, _("incompatible options, see help.")
+            raise PyKotaCommandLineError, _("incompatible options, see help.")
         elif options["comment"] and not options["balance"] :    
-            raise PyKotaToolError, _("incompatible options, see help.")
+            raise PyKotaCommandLineError, _("incompatible options, see help.")
         else :
             retcode = editor.main(args, options)
     except KeyboardInterrupt :        
         sys.stderr.write("\nInterrupted with Ctrl+C !\n")
+    except PyKotaCommandLineError, msg :     
+        sys.stderr.write("%s : %s\n" % (sys.argv[0], msg))
     except SystemExit :        
         pass