Changeset 3105

Timestamp:

12/02/06 14:14:09 (18 years ago)

Author:

jerome

Message:

Didn't reroute printers with --cups in modification mode.

Files:

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

pykota/trunk/bin/pkprinters

@@ -168 +168 @@
             return False
         
+    def reroutePrinterThroughPyKota(self, printer) :    
+        """Reroutes a CUPS printer through PyKota."""
+        uri = self.getPrinterDeviceURI(printer.Name)
+        if not self.isPrinterCaptured(deviceuri=uri) :
+             newuri = "cupspykota://%s" % uri
+             self.regainPriv() # to avoid having to enter password.
+             os.system('lpadmin -p "%s" -v "%s"' % (printer.Name, newuri))
+             self.logdebug("Printer %s rerouted to %s" % (printer.Name, newuri))
+             self.dropPriv()
+             
+    def deroutePrinterFromPyKota(self, printer) :    
+        """Deroutes a PyKota printer through CUPS only."""
+        uri = self.getPrinterDeviceURI(printer.Name)
+        if self.isPrinterCaptured(deviceuri=uri) :
+             newuri = uri.replace("cupspykota:", "")
+             if newuri.startswith("//") :
+                 newuri = newuri[2:]
+             self.regainPriv() # to avoid having to enter password.
+             os.system('lpadmin -p "%s" -v "%s"' % (printer.Name, newuri))
+             self.logdebug("Printer %s rerouted to %s" % (printer.Name, newuri))
+             self.dropPriv()    
+                                     
     def main(self, names, options) :
         """Manage printers."""
@@ -206 +228 @@
             percent.display("\n%s..." % _("Deletion"))
             self.storage.deleteManyPrinters(printers)
+            percent.display("\n")
             if docups :
-                percent.display("\n%s...\n" % _("Rerouting printers to CUPS"))
+                percent.display("%s...\n" % _("Rerouting printers to CUPS"))
                 for printer in printers :
-                    uri = self.getPrinterDeviceURI(printer.Name)
-                    if self.isPrinterCaptured(deviceuri=uri) :
-                         newuri = uri.replace("cupspykota:", "")
-                         if newuri.startswith("//") :
-                             newuri = newuri[2:]
-                         self.regainPriv() # to avoid having to enter password.
-                         os.system('lpadmin -p "%s" -v "%s"' % (printer.Name, newuri))
-                         self.logdebug("Printer %s rerouted to %s" % (printer.Name, newuri))
-                         self.dropPriv()    
+                    self.deroutePrinterFromPyKota(printer)
                     percent.oneMore()
-            percent.display("\n")
         else :
             if options["groups"] :        
@@ -274 +288 @@
                             
                             if docups :
-                                 uri = self.getPrinterDeviceURI(printer.Name)
-                                 if not self.isPrinterCaptured(deviceuri=uri) :
-                                      newuri = "cupspykota://%s" % uri
-                                      self.regainPriv() # to avoid having to enter password.
-                                      os.system('lpadmin -p "%s" -v "%s"' % (printer.Name, newuri))
-                                      self.logdebug("Printer %s rerouted to %s" % (printer.Name, newuri))
-                                      self.dropPriv()
+                                 self.reroutePrinterThroughPyKota(printer)
                                      
                             if oldprinter is not None :
@@ -308 +316 @@
                         printer.save()    
                         self.managePrintersGroups(printersgroups, printer, remove)
+                        if docups :
+                            self.reroutePrinterThroughPyKota(printer)
                         percent.oneMore()
             except :