Changeset 1411

Timestamp:

03/18/04 20:11:25 (21 years ago)

Author:

jalet

Message:

Fix for raw jobs in cupspykota

Location:

pykota/trunk

Files:

• bin/cupspykota (modified) (7 diffs)
• NEWS (modified) (1 diff)
• pykota/version.py (modified) (1 diff)

pykota/trunk/bin/cupspykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.37  2004/03/18 19:11:25  jalet
+# Fix for raw jobs in cupspykota
+#
 # Revision 1.36  2004/03/18 14:03:18  jalet
 # Added fsync() calls
@@ -317 +320 @@
         
         # Save file descriptors, we will need them later.
-        infno = infile.fileno()
         stdoutfno = sys.stdout.fileno()
         stderrfno = sys.stderr.fileno()
@@ -327 +329 @@
         # So we use a poll object to know when to read or write
         pollster = select.poll()
-        pollster.register(infno, select.POLLIN | select.POLLPRI)
         pollster.register(fromcfno, select.POLLIN | select.POLLPRI)
         pollster.register(cerrfno, select.POLLIN | select.POLLPRI)
@@ -340 +341 @@
         endinput = endoutput = enderr = 0
         inputclosed = outputclosed = errclosed = 0
+        
+        if self.preserveinputfile is None :
+            # this is not a real file, we read the job's data
+            # from stdin 
+            infno = infile.fileno()
+            pollster.register(infno, select.POLLIN | select.POLLPRI)
+        else :    
+            # job's data is in a file, no need to pass the data
+            # to the real backend
+            self.logdebug("Job's data is in %s" % self.preserveinputfile)
+            infno = None
+            endinput = 1
+        
         killed = 0
         self.logdebug("Entering streams polling loop...")
@@ -366 +380 @@
                         if indata :
                             os.write(fd, indata)    
-                            os.fsync(fd)
+                            try :
+                                os.fsync(fd)
+                            except OSError :
+                                pass
                             indata = ""
                         if endinput :    
@@ -376 +393 @@
                         if outdata :
                             os.write(fd, outdata)
-                            os.fsync(fd)
+                            try :
+                                os.fsync(fd)
+                            except OSError :    
+                                pass
                             outdata = ""
                         if endoutput :    
@@ -384 +404 @@
                         if errdata :
                             os.write(fd, errdata)
-                            os.fsync(fd)
+                            try :
+                                os.fsync(fd)
+                            except OSError :    
+                                pass
                             errdata = ""
                         if enderr :    

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
 
+    - 1.18beta2 :
+      
+        - Fix for raw jobs with cupspykota
+        
     - 1.18beta :
     

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.18beta_unofficial"
+__version__ = "1.18beta2_unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""