Changeset 2512 for pykota/trunk/bin/repykota

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

pykota/trunk/bin/repykota

@@ -31 +31 @@
 from mx import DateTime
 
-from pykota.tool import PyKotaTool, PyKotaToolError, crashed, N_
-from pykota.config import PyKotaConfigError
-from pykota.storage import PyKotaStorageError
-from pykota.reporter import PyKotaReporterError
+from pykota.tool import PyKotaTool, PyKotaToolError, PyKotaCommandLineError, crashed, N_
 from pykota import reporter
 
@@ -110 +107 @@
             # reports only the current user
             if options["ingroups"] :
-                raise PyKotaToolError, _("Option --ingroups is reserved to PyKota Administrators.")
+                raise PyKotaCommandLineError, _("Option --ingroups is reserved to PyKota Administrators.")
                 
             username = pwd.getpwuid(os.geteuid())[0]
@@ -124 +121 @@
         printers = self.storage.getMatchingPrinters(options["printer"])
         if not printers :
-            raise PyKotaToolError, _("There's no printer matching %s") % options["printer"]
+            raise PyKotaCommandLineError, _("There's no printer matching %s") % options["printer"]
             
         self.reportingtool = reporter.openReporter(self, "text", printers, ugnames, (options["groups"] and 1) or 0)    
@@ -157 +154 @@
         elif options["version"] :
             reportTool.display_version_and_quit()
-        elif options["users"] and options["groups"] :    
-            raise PyKotaToolError, _("incompatible options, see help.")
+        elif (options["users"] or options["ingroups"]) and options["groups"] :
+            raise PyKotaCommandLineError, _("incompatible options, see help.")
         else :
             retcode = reportTool.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