Changeset 3076

Timestamp:

11/28/06 22:32:21 (17 years ago)

Author:

jerome

Message:

Now raises PyKotaToolError? when the error is not on the command line.

Files:

• pykota/trunk/bin/pknotify (modified) (4 diffs)

pykota/trunk/bin/pknotify

@@ -38 +38 @@
     hasPAM = 1
 
-from pykota.tool import Tool, PyKotaCommandLineError, crashed, N_
+from pykota.tool import Tool, PyKotaToolError, PyKotaCommandLineError, crashed, N_
 
 __doc__ = N_("""pknotify v%(__version__)s (c) %(__years__)s %(__author__)s
@@ -179 +179 @@
         """Checks if we could authenticate an username with a password."""
         if not hasPAM :    
-            raise PyKotaCommandLineError, _("You MUST install PyPAM for this functionnality to work !")
+            raise PyKotaToolError, _("You MUST install PyPAM for this functionnality to work !")
         else :    
             retcode = False
@@ -298 +298 @@
                 if errnum == errno.ECONNREFUSED :
                     self.printInfo(_("Are you sure that PyKotIcon is running and accepting incoming connections on %s:%s ?") % (self.destination, self.port), "error")
-            raise PyKotaCommandLineError, "%s : %s" % (_("Connection error"), str(msg))
+            raise PyKotaToolError, "%s : %s" % (_("Connection error"), str(msg))
         except TimeoutError, msg :    
             self.printInfo(msg, "warn")
@@ -361 +361 @@
     except PyKotaCommandLineError, msg :    
         sys.stderr.write("%s : %s\n" % (sys.argv[0], msg))
+        print "CANCEL"  # Forces the cancellation of the print job if a command line switch is incorrect
         retcode = -2
     except SystemExit :