Changeset 2512 for pykota/trunk/bin/pkbcodes

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/pkbcodes (modified) (4 diffs)

pykota/trunk/bin/pkbcodes

@@ -29 +29 @@
 import pwd
 
-from pykota.tool import PyKotaTool, PyKotaToolError, crashed, N_
+from pykota.tool import PyKotaTool, PyKotaToolError, PyKotaCommandLineError, crashed, N_
 
 __doc__ = N_("""pkbcodes v%(__version__)s (c) %(__years__)s %(__author__)s
@@ -87 +87 @@
         """Manage billing codes."""
         if (not self.config.isAdmin) and (not options["list"]) :
-            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."))
             
         if (options["list"] or options["reset"]) and not names :
@@ -111 +111 @@
             billingcodes = self.storage.getMatchingBillingCodes(",".join(names))
             if not billingcodes :
-                raise PyKotaToolError, _("There's no billingcode matching %s") % " ".join(names)
+                raise PyKotaCommandLineError, _("There's no billingcode matching %s") % " ".join(names)
                     
         for billingcode in billingcodes :        
@@ -160 +160 @@
            or (options["skipexisting"] and not options["add"]) \
            or (options["list"] and (options["add"] or options["delete"] or options["reset"] or options["description"])) :
-            raise PyKotaToolError, _("incompatible options, see help.")
+            raise PyKotaCommandLineError, _("incompatible options, see help.")
         elif (not args) and (options["add"] or options["delete"]) :    
-            raise PyKotaToolError, _("You have to pass billing codes on the command line")
+            raise PyKotaCommandLineError, _("You have to pass billing codes on the command line")
         else :
             retcode = manager.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