Changeset 1696

Timestamp:

09/02/04 16:40:13 (20 years ago)

Author:

jalet

Message:

Another bunch of LPRng fixes

Location:

pykota/trunk

Files:

• bin/lprngpykota (modified) (3 diffs)
• NEWS (modified) (1 diff)

pykota/trunk/bin/lprngpykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.6  2004/09/02 14:40:13  jalet
+# Another bunch of LPRng fixes
+#
 # Revision 1.5  2004/07/23 11:19:48  jalet
 # 1.19beta is out !
@@ -80 +83 @@
             return [line[11:] for line in os.environ.get("HF", "").split() if line.startswith("remotehost=")][0]
         except IndexError :    
-            return None
+            try :
+                return [line[1:] for line in os.environ.get("CONTROL", "").split() if line.startswith("H")][0]
+            except IndexError :    
+                return None
                 
     def firstPass(self, policy, printer, user, userpquota) :            
@@ -244 +250 @@
             return self.acceptJob()
         else :    
-            if (not printer.LastJob.Exists) or (printer.LastJob.JobId != self.jobid) :
+            if printer.LastJob.Exists and (printer.LastJob.JobId == self.jobid) :
+                # here we know we are in second pass.
+                return self.secondPass(policy, printer, user, userpquota)
+            else :    
                 # Last job for current printer has a different JobId than
                 # the current job, so we know we are in the first pass.
                 return self.firstPass(policy, printer, user, userpquota)
-            else :    
-                # and here we know we are in second pass.
-                return self.secondPass(policy, printer, user, userpquota)
             
 if __name__ == "__main__" :    

pykota/trunk/NEWS

@@ -24 +24 @@
     - 1.20alpha6 :
       
-        - Small fix for old versions of LPRng.
+        - Small fixes for LPRng.
         
         - Now exports PYKOTAPRINTERHOSTNAME for network printers'