Changeset 1740

Timestamp:

09/23/04 21:29:36 (20 years ago)

Author:

jalet

Message:

If SNMP accounting is possible, pkhint now suggests to use the internal
SNMP handling instead of the external one. No real test is done for now,
though.

Location:

pykota/trunk

Files:

• bin/pkhint (modified) (3 diffs)
• NEWS (modified) (1 diff)
• pykota/version.py (modified) (1 diff)

pykota/trunk/bin/pkhint

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.17  2004/09/23 19:29:36  jalet
+# If SNMP accounting is possible, pkhint now suggests to use the internal
+# SNMP handling instead of the external one. No real test is done for now,
+# though.
+#
 # Revision 1.16  2004/07/27 21:50:29  jalet
 # Small fix for %(port)s thanks to rpinheiro
@@ -86 +91 @@
 from pykota.config import PyKotaConfigError
 from pykota.storage import PyKotaStorageError
+try :
+    import pysnmp
+except ImportError :    
+    hasSNMP = 0
+else :    
+    hasSNMP = 1
 
 __doc__ = """pkhint v%s (c) 2003-2004 C@LL - Conseil Internet & Logiciels Libres
@@ -246 +257 @@
                         port = 9100             # TODO : may cause problems with other protocols.
                         
+                        
                     snmpcommand = self.accepts(SNMPTESTS, hostname)
                     if snmpcommand is not None :
-                        accounter = 'hardware(/usr/share/pykota/waitprinter.sh %(printer)s && ' + snmpcommand + ')'
+                        if hasSNMP :
+                            # don't do a more complex test, just consider it will work
+                            accounter = 'hardware(snmp)'
+                        else :    
+                            accounter = 'hardware(/usr/share/pykota/waitprinter.sh %(printer)s && ' + snmpcommand + ')'
                         configuration.append((printer, accounter))
                     else :    

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
 
+    - 1.20alpha14 :
+    
+        - External hardware accounter now loops until
+          a result can be read correctly.
+          
+        - pkhint now suggest the internal snmp handling instead
+          of the external one.
+          
     - 1.20alpha13 :
      

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.20alpha13_unofficial"
+__version__ = "1.20alpha14_unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""