Changeset 1902

Timestamp:

11/06/04 23:40:57 (20 years ago)

Author:

jalet

Message:

Safer code

Files:

• pykota/trunk/bin/cupspykota (modified) (3 diffs)

pykota/trunk/bin/cupspykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.77  2004/11/06 22:40:57  jalet
+# Safer code
+#
 # Revision 1.76  2004/11/06 22:35:58  jalet
 # Added a miniparser for IPP messages (RFC 2910). The job-originating-host-name
@@ -344 +347 @@
         
     def getCupsConfigDirectives(self, directives=[]) :
-        """Retrieves some CUPS directives from its configuration file."""
+        """Retrieves some CUPS directives from its configuration file.
+        
+           Returns a mapping with lowercased directives as keys and 
+           their setting as values.
+        """
         dirvalues = {} 
         cupsroot = os.environ.get("CUPS_SERVERROOT", "/etc/cups")
@@ -421 +428 @@
             else :    
                 self.logdebug("Parsing of IPP message file %s begins." % ippmessagefile)
-                ippmessage = IPPMessage(ippdatafile.read())
-                self.logdebug("Parsing of IPP message file %s ends." % ippmessagefile)
+                try :
+                    ippmessage = IPPMessage(ippdatafile.read())
+                except PyKotaIPPError, msg :    
+                    self.printInfo("Error while parsing %s : %s" % (ippmessagefile, msg), "warn")
+                else :    
+                    self.logdebug("Parsing of IPP message file %s ends." % ippmessagefile)
                 ippdatafile.close()