Changeset 2961

Timestamp:

06/27/06 23:47:26 (18 years ago)

Author:

jerome

Message:

Ensures no problem can occur during early cleanup, by moving
data initialization code upwards.

Files:

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

pykota/trunk/bin/cupspykota

@@ -237 +237 @@
         # the environment before launching the real backend 
         self.logdebug("Initializing backend...")
+        
+        self.PrinterName = os.environ.get("PRINTER", "")
+        self.Directory = self.config.getPrinterDirectory(self.PrinterName)
+        self.Action = "ALLOW"   # job allowed by default
+        self.Reason = None
+        self.JobId = sys.argv[1].strip()
+        # use CUPS' user when printing test pages from CUPS' web interface
+        self.UserName = sys.argv[2].strip() or self.originalUserName or pwd.getpwuid(os.geteuid())[0]
+        self.Title = sys.argv[3].strip()
+        self.Copies = int(sys.argv[4].strip())
+        self.Options = sys.argv[5].strip()
+        if len(sys.argv) == 7 :
+            self.InputFile = sys.argv[6] # read job's datas from file
+        else :    
+            self.InputFile = None        # read job's datas from stdin
+        self.DataFile = os.path.join(self.Directory, "%s-%s-%s-%s" % \
+                   (self.myname, self.PrinterName, self.UserName, self.JobId))
+        
         muststartwith = "%s:" % self.myname
         device_uri = os.environ.get("DEVICE_URI", "")
@@ -261 +279 @@
                 destination = checkauth[1]
             printerhostname = destination.split("/")[0].split(":")[0]
-        
-        self.Action = "ALLOW"   # job allowed by default
-        self.Reason = None
-        self.JobId = sys.argv[1].strip()
-        # use CUPS' user when printing test pages from CUPS' web interface
-        self.UserName = sys.argv[2].strip() or self.originalUserName or pwd.getpwuid(os.geteuid())[0]
-        self.Title = sys.argv[3].strip()
-        self.Copies = int(sys.argv[4].strip())
-        self.Options = sys.argv[5].strip()
-        if len(sys.argv) == 7 :
-            self.InputFile = sys.argv[6] # read job's datas from file
-        else :    
-            self.InputFile = None        # read job's datas from stdin
             
         self.PrinterHostName = printerhostname    
         self.RealBackend = backend
         self.DeviceURI = device_uri
-        self.PrinterName = os.environ.get("PRINTER", "")
-        self.Directory = self.config.getPrinterDirectory(self.PrinterName)
-        self.DataFile = os.path.join(self.Directory, "%s-%s-%s-%s" % \
-                   (self.myname, self.PrinterName, self.UserName, self.JobId))
         
         connerror = False
@@ -497 +498 @@
             self.logdebug("Work file %s will be deleted." % self.DataFile)
             try :
-                os.remove(self.DataFile)
+                if os.path.exists(self.DataFile) :
+                    os.remove(self.DataFile)
             except OSError, msg :
                 self.logdebug("Problem while deleting work file %s : %s" % (self.DataFile, msg))