[apt-proxy-devel] r711 - trunk/apt_proxy

[Xavier Lüthi]

Author: xluthi
Date: Fri Dec 11 17:14:19 2009
New Revision: 711

Log:
Correct handling of empty configuration file options (Closes: #285770)

Modified:
   trunk/apt_proxy/apt_proxy_conf.py

Modified: trunk/apt_proxy/apt_proxy_conf.py
==============================================================================
--- trunk/apt_proxy/apt_proxy_conf.py	Fri Dec 11 17:09:42 2009	(r710)
+++ trunk/apt_proxy/apt_proxy_conf.py	Fri Dec 11 17:14:19 2009	(r711)
@@ -45,12 +45,17 @@
 
     def getint(self, section, option):
         value = self.get(section, option)
+        # see bug #285770
+        if len(value) == 0:
+            return None
         return int(value)
     def gettime(self, section, option):
         mult = 1
         value = self.get(section, option)
         if len(value) == 0:
-            raise ConfigError("Configuration parse error: [%s] %s" % (section, option))
+            # see bug #285770
+            #raise ConfigError("Configuration parse error: [%s] %s" % (section, option))
+            return None
         suffix = value[-1].lower()
         if suffix in self.time_multipliers.keys():
             mult = self.time_multipliers[suffix]
@@ -196,6 +201,10 @@
         # read default values
         for name,default,getmethod in self.CONFIG_ITEMS:
             value = self.parseConfigValue(config, DEFAULTSECT, name, default, getmethod)
+            # see bug #285770
+            if value == None:
+                value = default
+            # end of bug #285770
             setattr(self, name, value)
             if value != default and name != "telnet_pass":
                 log.debug("config value %s=%s"%(name, value), 'config')