Changeset 3103

Timestamp:

12/01/06 23:14:47 (18 years ago)

Author:

jerome

Message:

Simplified the import of printers.
Linked to pkpgcounter v2.12.

Files:

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

pykota/trunk/bin/pksetup

@@ -197 +197 @@
         
     otherpackages = [ { "name" : "pkpgcounter",
-                        "version" : "2.10",
+                        "version" : "2.12",
                         "url" : "http://www.pykota.com/software/%(name)s/download/tarballs/%(name)s-%(version)s.tar.gz",
                         "commands" : [ "tar -zxf %(name)s-%(version)s.tar.gz",
@@ -349 +349 @@
                 self.confirmCommand("to improve PyKota's configuration wrt your existing printers", 'echo "%(suffix)s" >>%(home)s/pykota.conf' % locals())
         
-    def importPrinters(self) :
-        """Imports the existing print queues in the database."""
-        self.confirmCommand("to import your existing print queues into PyKota's database", "pkturnkey --force 2>/dev/null")
-            
     def addPyKotaUser(self) :
         """Adds a system user named pykota, returns its home directory or None"""
@@ -378 +374 @@
         """For each printer, asks if it should be managed with PyKota or not."""
         for (queuename, deviceuri) in printers :
-            if not deviceuri.startswith("cupspykota:") :
-                newdeviceuri = "cupspykota://%s" % deviceuri
-                command = "lpadmin -p %(queuename)s -v %(newdeviceuri)s" % locals()
-                self.confirmCommand("to manage the %(queuename)s print queue with PyKota" % locals(), command)
+            command = 'pkprinters --add --cups --description "Printer created with pksetup" "%(queuename)s"' % locals()
+            self.confirmCommand("to import the %(queuename)s print queue into PyKota's database and reroute it through PyKota" % locals(), command)
     
     def setup(self) :
@@ -402 +396 @@
             self.setupBackend()
             self.managePrinters(self.listPrinters())
-            self.importPrinters()
             print nowready
             print "The script %s can be used to reinstall in unattended mode.\n" % self.genInstaller()