Changeset 1483 for pykota/trunk/bin/pkhint
- Timestamp:
- 05/18/04 16:49:34 (20 years ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
pykota/trunk/bin/pkhint
r1475 r1483 24 24 # 25 25 # $Log$ 26 # Revision 1.8 2004/05/18 14:48:47 jalet 27 # Big code changes to completely remove the need for "requester" directives, 28 # jsut use "hardware(... your previous requester directive's content ...)" 29 # 26 30 # Revision 1.7 2004/05/13 13:59:27 jalet 27 31 # Code simplifications … … 214 218 snmpcommand = self.accepts(SNMPTESTS, hostname) 215 219 if snmpcommand is not None : 216 accounter = "hardware" 217 requester = 'external(/usr/share/pykota/waitprinter.sh %(printer)s && ' + snmpcommand + ')' 218 configuration.append((printer, accounter, requester)) 220 accounter = 'hardware(/usr/share/pykota/waitprinter.sh %(printer)s && ' + snmpcommand + ')' 221 configuration.append((printer, accounter)) 219 222 else : 220 223 netpjlcommand = self.accepts(NETPJLTESTS, hostname, port) 221 224 if netpjlcommand is not None : 222 accounter = "hardware" 223 requester = 'external(' + netpjlcommand + ')' 224 configuration.append((printer, accounter, requester)) 225 accounter = 'hardware(' + netpjlcommand + ')' 226 configuration.append((printer, accounter)) 225 227 elif devicetype == "direct" : 226 228 sys.stderr.write("Can't currently handle device %s for printer %s\n" % (device, printer)) … … 234 236 else : 235 237 print "\nPut the following lines into your /etc/pykota/pykota.conf file :\n" 236 for (printer, accounter , requester) in configuration :238 for (printer, accounter) in configuration : 237 239 print "[%s]" % printer 238 240 print "accounter: %s" % accounter 239 if requester is not None :240 print "requester: %s" % requester241 241 print 242 242