Changeset 602

Timestamp:

03/21/05 14:25:27 (20 years ago)

Author:

jerome

Message:

Doesn't set TEASTATUS when a prehook cancels the job

Location:

tea4cups/trunk

Files:

• tea4cups (modified) (4 diffs)
• tea4cups.conf (modified) (1 diff)

tea4cups/trunk/tea4cups

@@ -227 +227 @@
         """Initializes the CUPS backend wrapper."""
         self.gotSigTerm = 0
+        self.isCancelled = 0    # did a prehook cancel the print job ?
         signal.signal(signal.SIGTERM, signal.SIG_IGN)
         signal.signal(signal.SIGPIPE, signal.SIG_IGN)
@@ -538 +539 @@
             if status :
                 exitcode = status
-            if (branchtype == "prehook") and (os.environ.get("TEASTATUS", "") == "CANCELLED") :
+            if (branchtype == "prehook") and self.isCancelled :
                 break # We don't want to execute tees or posthooks in this case
         signal.signal(signal.SIGTERM, signal.SIG_IGN)
@@ -571 +572 @@
                     if (btype == "prehook") and (retcode == 255) : # -1
                         self.logInfo("Job %s cancelled by prehook %s" % (self.JobId, branch))
-                        os.environ["TEASTATUS"] = "CANCELLED" # and don't touch exitcode
+                        self.isCancelled = 1
                     else :    
                         self.logInfo("%s %s on printer %s didn't exit successfully." % (btypetitle, branch, self.PrinterName), "error")
@@ -609 +610 @@
                     if (btype == "prehook") and (retcode == 255) : # -1
                         self.logInfo("Job %s cancelled by prehook %s" % (self.JobId, branch))
-                        os.environ["TEASTATUS"] = "CANCELLED" # and don't touch exitcode
+                        self.isCancelled = 1
                     else :    
                         self.logInfo("%s %s (PID %s) on printer %s didn't exit successfully." % (btypetitle, branch, childpid, self.PrinterName), "error")

tea4cups/trunk/tea4cups.conf

@@ -109 +109 @@
 #
 # NB : as a special feature, any prehook which exits with a -1 status (255) 
-# causes the job to NOT be sent to the real backend, in which case TEASTATUS 
-# value is the string CANCELLED. None of the tees and posthooks gets executed
-# in this case, but all remaining prehooks are still executed.
+# causes the job to NOT be sent to the real backend, effectively cancelling it.
+# None of the tees and posthooks gets executed in this case, but all 
+# remaining prehooks are still executed.
 #