Changeset 2802

Timestamp:

03/24/06 00:22:33 (19 years ago)

Author:

jerome

Message:

Cleaned up some things... It seems I've found a bug either in libc, libpam or
in python-pam, so wait and see...

Files:

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

pykota/trunk/bin/pknotify

@@ -154 +154 @@
         return xmlrpclib.Binary(msg.replace("\\n", "\n"))
         
-    def convPAM(self, auth, queries, userdata) :
+    def convPAM(self, auth, queries=[], userdata=None) :
         """Prepares PAM datas."""
         response = []
@@ -194 +194 @@
     def alarmHandler(self, signum, frame) :        
         """Alarm handler."""
-        raise TimeoutError, "The end user at %s:%i didn't answer after %i seconds !" % (self.destination, self.port, self.timeout)
+        raise TimeoutError, _("The end user at %s:%i didn't answer within %i seconds. The print job will be cancelled.") % (self.destination, self.port, self.timeout)
         
     def main(self, arguments, options) :
@@ -266 +266 @@
         except TimeoutError, msg :    
             self.printInfo(msg, "warn")
+            print "CANCEL"      # Timeout occured : job is cancelled.
             
         if self.timeout :