[svn] commit: r3966 - /branches/trac435/src/lib/python/isc/config/cfgmgr.py

[BIND 10 source code commits]

Author: jelte
Date: Wed Dec 22 15:50:29 2010
New Revision: 3966

Log:
fail with exit if configuration file cannot be read for any other ioerror reason than 'file not found'

Modified:
    branches/trac435/src/lib/python/isc/config/cfgmgr.py

Modified: branches/trac435/src/lib/python/isc/config/cfgmgr.py
==============================================================================
--- branches/trac435/src/lib/python/isc/config/cfgmgr.py (original)
+++ branches/trac435/src/lib/python/isc/config/cfgmgr.py Wed Dec 22 15:50:29 2010
@@ -26,6 +26,7 @@
 import copy
 import tempfile
 import json
+import errno
 from isc.cc import data
 from isc.config import ccsession, config_data
 
@@ -87,7 +88,12 @@
             else:
                 raise ConfigManagerDataReadError("No version information in configuration file " + config.db_filename)
         except IOError as ioe:
-            raise ConfigManagerDataEmpty("No configuration file found")
+            # if IOError is 'no such file or directory', then continue
+            # (raise empty), otherwise fail (raise error)
+            if ioe.errno == errno.ENOENT:
+                raise ConfigManagerDataEmpty("No configuration file found")
+            else:
+                raise ConfigManagerDataReadError("Can't read configuration file: " + str(ioe))
         except ValueError:
             raise ConfigManagerDataReadError("Configuration file out of date or corrupt, please update or remove " + config.db_filename)
         finally: