Changeset 3269 for pykota/trunk/bin

Timestamp:

12/10/07 22:54:17 (17 years ago)

Author:

jerome

Message:

Doesn't reroute/deroute the CUPS print queue through PyKota anymore if its
Device URI can't be retrieved. Also logs a warning message in this case.

Files:

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

pykota/trunk/bin/pkprinters

@@ -156 +156 @@
             return cups.doRequest(req).printer["device-uri"][0][1]
         except :    
+            self.printInfo(_("Impossible to retrieve %(printername)s's DeviceURI") % locals(), "warn")
             return ""
         
@@ -168 +169 @@
         """Reroutes a CUPS printer through PyKota."""
         uri = self.getPrinterDeviceURI(printer.Name)
-        if not self.isPrinterCaptured(deviceuri=uri) :
+        if uri and (not self.isPrinterCaptured(deviceuri=uri)) :
              newuri = "cupspykota://%s" % uri
              self.regainPriv() # to avoid having to enter password.
@@ -178 +179 @@
         """Deroutes a PyKota printer through CUPS only."""
         uri = self.getPrinterDeviceURI(printer.Name)
-        if self.isPrinterCaptured(deviceuri=uri) :
+        if uri and self.isPrinterCaptured(deviceuri=uri) :
              newuri = uri.replace("cupspykota:", "")
              if newuri.startswith("//") :