Changeset 3073 for pykota/trunk/bin

Timestamp:

11/27/06 22:06:14 (18 years ago)

Author:

jerome

Message:

Now pkprinters doesn't modify CUPS' printers.conf if the -C | --cups
command line switch is not used.

Files:

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

pykota/trunk/bin/pkprinters

@@ -54 +54 @@
   
   -D | --description d Adds a textual description to printers.
-                       
+
+  -C | --cups          Also modifies the DeviceURI in CUPS' printers.conf
+
   -c | --charge p[,j]  Sets the price per page and per job to charge.
                        Job price is optional.
@@ -171 +173 @@
             raise PyKotaCommandLineError, "%s : %s" % (pwd.getpwuid(os.geteuid())[0], _("You're not allowed to use this command."))
             
+        docups = options["cups"]
+        
         if not options["list"] :    
             percent = Percent(self)
@@ -202 +206 @@
             percent.display("\n%s..." % _("Deletion"))
             self.storage.deleteManyPrinters(printers)
-            percent.display("\n%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()    
-                percent.oneMore()
+            if docups :
+                percent.display("\n%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()    
+                    percent.oneMore()
             percent.display("\n")
         else :
@@ -268 +273 @@
                             oldprinter = self.storage.addPrinter(printer)               
                             
-                            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()
+                            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()
                                      
                             if oldprinter is not None :
@@ -315 +321 @@
     retcode = 0
     try :
-        short_options = "hvac:D:dg:lrsnpm:"
-        long_options = ["help", "version", "add", "charge=", "description=", \
+        short_options = "hvaCc:D:dg:lrsnpm:"
+        long_options = ["help", "version", "add", "cups", "charge=", "description=", \
                         "delete", "groups=", "list", "remove", \
                         "skipexisting", "passthrough", "nopassthrough", \
@@ -332 +338 @@
         options["version"] = options["v"] or options["version"]
         options["add"] = options["a"] or options["add"]
+        options["cups"] = options["C"] or options["cups"]
         options["charge"] = options["c"] or options["charge"]
         options["description"] = options["D"] or options["description"]