Changeset 2512 for pykota/trunk/bin/pykosd

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/pykosd (modified) (5 diffs)

pykota/trunk/bin/pykosd

@@ -36 +36 @@
     sys.exit(-1)
 
-from pykota.tool import PyKotaTool, PyKotaToolError, crashed, N_
+from pykota.tool import PyKotaTool, PyKotaToolError, PyKotaCommandLineError, crashed, N_
 
 __doc__ = N_("""pykosd v%(__version__)s (c) %(__years__)s %(__author__)s
@@ -83 +83 @@
         try :    
             duration = int(options["duration"])
-        except :    
-            raise PyKotaToolError, _("Invalid duration option %s") % str(options["duration"])
+            if duration <= 0 :
+                raise ValueError 
+        except :    
+            raise PyKotaCommandLineError, _("Invalid duration option %s") % str(options["duration"])
             
         try :    
             loop = int(options["loop"])
-        except :    
-            raise PyKotaToolError, _("Invalid loop option %s") % str(options["loop"])
+            if loop < 0 :
+                raise ValueError
+        except :    
+            raise PyKotaCommandLineError, _("Invalid loop option %s") % str(options["loop"])
             
         try :    
             sleep = float(options["sleep"])
-        except :    
-            raise PyKotaToolError, _("Invalid sleep option %s") % str(options["sleep"])
+            if sleep <= 0 :
+                raise ValueError
+        except :    
+            raise PyKotaCommandLineError, _("Invalid sleep option %s") % str(options["sleep"])
             
         color = options["color"]    
@@ -100 +106 @@
             color = "#%s" % color
         if len(color) != 7 :    
-            raise PyKotaToolError, _("Invalid color option %s") % str(color)
+            raise PyKotaCommandLineError, _("Invalid color option %s") % str(color)
         savecolor = color
         
@@ -108 +114 @@
             user = cmd.storage.getUserFromBackend(uname)        # don't use cache
             if not user.Exists :
-                raise PyKotaToolError, _("User %s doesn't exist in PyKota's database") % uname
+                raise PyKotaCommandLineError, _("User %s doesn't exist in PyKota's database") % uname
             if user.LimitBy == "quota" :    
                 printers = cmd.storage.getMatchingPrinters("*")
@@ -177 +183 @@
     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