- Timestamp:
- 05/06/04 22:30:26 (21 years ago)
- Location:
- pykota/trunk
- Files:
-
- 12 modified
Legend:
- Unmodified
- Added
- Removed
-
pykota/trunk/bin/pkprinters
r1452 r1453 24 24 # 25 25 # $Log$ 26 # Revision 1.8 2004/05/06 20:30:24 jalet 27 # Added --skipexisting command line option to pkprinters 28 # 26 29 # Revision 1.7 2004/05/06 12:51:58 jalet 27 30 # Documentation … … 69 72 70 73 -a | --add Adds printers if they don't exist on the Quota 71 Storage Server. Doesn't modify any already72 existing printer.74 Storage Server. If they exist, they are modified 75 unless -s|--skipexisting is also used. 73 76 74 77 -d | --delete Deletes printers from the quota storage. … … 99 102 -r | --remove In combination with the --groups option above, 100 103 remove printers from the specified printers groups. 104 105 -s | --skipexisting In combination with the --add option above, tells 106 pkprinters to not modify existing printers. 101 107 102 108 printer1 through printerN can contain wildcards if the --add option … … 173 179 printer = self.storage.getPrinter(pname) 174 180 if printer.Exists : 175 self.logger.log_message(_("Printer %s already exists, skipping.") % printer.Name, "warn") 181 if options["skipexisting"] : 182 self.logger.log_message(_("Printer %s already exists, skipping.") % printer.Name, "warn") 183 else : 184 self.logger.log_message(_("Printer %s already exists, will be modified.") % printer.Name, "warn") 185 printers.append(printer) 176 186 else : 177 187 if self.isValidName(pname) : … … 211 221 retcode = 0 212 222 try : 213 short_options = "hvac:dg:lr "214 long_options = ["help", "version", "add", "charge=", "delete", "groups=", "list", "remove" ]223 short_options = "hvac:dg:lrs" 224 long_options = ["help", "version", "add", "charge=", "delete", "groups=", "list", "remove", "skipexisting"] 215 225 216 226 # Initializes the command line tool … … 229 239 options["list"] = options["l"] or options["list"] 230 240 options["remove"] = options["r"] or options["remove"] 241 options["skipexisting"] = options["s"] or options["skipexisting"] 231 242 232 243 if options["help"] : … … 235 246 manager.display_version_and_quit() 236 247 elif (options["delete"] and (options["add"] or options["groups"] or options["charge"] or options["remove"])) \ 248 or (options["skipexisting"] and not options["add"]) \ 237 249 or (options["list"] and (options["add"] or options["delete"] or options["groups"] or options["charge"] or options["remove"])) : 238 250 raise PyKotaToolError, _("incompatible options, see help.") -
pykota/trunk/man/pkprinters.1
r1452 r1453 21 21 \fB\-a\fR | \fB\-\-add\fR 22 22 Adds printers if they don't exist on the Quota 23 Storage Server. Doesn't modify any already24 existing printer.23 Storage Server. If they exist, they are modified 24 unless \fB\-s\fR|--skipexisting is also used. 25 25 .TP 26 26 \fB\-d\fR | \fB\-\-delete\fR … … 55 55 In combination with the \fB\-\-groups\fR option above, 56 56 remove printers from the specified printers groups. 57 .TP 58 \fB\-s\fR | \fB\-\-skipexisting\fR 59 In combination with the \fB\-\-add\fR option above, tells 60 pkprinters to not modify existing printers. 57 61 .IP 58 62 printer1 through printerN can contain wildcards if the \fB\-\-add\fR option -
pykota/trunk/NEWS
r1451 r1453 24 24 - 1.19alpha5 : 25 25 26 - pkprinters --add now completely skips existing printers, but 27 logs a warning. 26 - pkprinters --skipexisting now tells pkprinters to not 27 modify existing printers when --add is used. 28 pkprinters logs a warning message whenever --add is 29 used and a printer already exists. 28 30 29 31 - 1.19alpha4 : -
pykota/trunk/po/br/pykota.po
r1451 r1453 487 487 msgstr "" 488 488 489 #, python-format 490 msgid "Printer %s already exists, will be modified." 491 msgstr "" 492 -
pykota/trunk/po/en/pykota.po
r1451 r1453 451 451 msgstr "" 452 452 453 #, python-format 454 msgid "Printer %s already exists, will be modified." 455 msgstr "" 456 -
pykota/trunk/po/es/pykota.po
r1451 r1453 491 491 msgstr "" 492 492 493 #, python-format 494 msgid "Printer %s already exists, will be modified." 495 msgstr "" 496 -
pykota/trunk/po/fr/pykota.po
r1451 r1453 478 478 msgstr "L'imprimante %s existe d�, ignor�" 479 479 480 #, python-format 481 msgid "Printer %s already exists, will be modified." 482 msgstr "L'imprimante %s existe d�, elle sera modifi�" 483 -
pykota/trunk/po/it/pykota.po
r1451 r1453 484 484 msgstr "" 485 485 486 #, python-format 487 msgid "Printer %s already exists, will be modified." 488 msgstr "" 489 -
pykota/trunk/po/pt/pykota.po
r1451 r1453 487 487 msgstr "" 488 488 489 #, python-format 490 msgid "Printer %s already exists, will be modified." 491 msgstr "" 492 -
pykota/trunk/po/pykota.pot
r1451 r1453 451 451 msgstr "" 452 452 453 #, python-format 454 msgid "Printer %s already exists, will be modified." 455 msgstr "" 456 -
pykota/trunk/po/se/pykota.po
r1451 r1453 483 483 msgstr "" 484 484 485 #, python-format 486 msgid "Printer %s already exists, will be modified." 487 msgstr "" 488