[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, master, updated. milestone4-368-g700ab82

[Michael 'Mickey' Lauer]

The following commit has been merged in the master branch:
commit 99209eb98249dcd68c6111e1594a140f0f812c51
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Thu Dec 18 07:48:12 2008 +0100

    do not error out, if /etc directory can't be found

diff --git a/framework/config.py b/framework/config.py
index 114cd47..5e216e9 100644
--- a/framework/config.py
+++ b/framework/config.py
@@ -103,6 +103,7 @@ logging.info( "Installprefix is %s" % installprefix )
 #
 # compute root dir
 #
+# FIXME should rather be named confdir or rulesdir or something like that
 possible_rootdirs = os.path.abspath(
     config.getValue( "frameworkd", "rootdir", "../etc/freesmartphone:/etc/freesmartphone:/usr/etc/freesmartphone" )
 ).split( ':' )
@@ -111,5 +112,6 @@ for path in possible_rootdirs:
         rootdir = path
         break
 else:
-    raise IOError( "can't find the root directory" )
-logging.info( "Root dir is %s" % rootdir )
+    logging.warning( "can't find the etc directory; defaulting to /etc/freesmartphone" )
+    rootdir = "/etc/freesmartphone"
+logging.info( "Etc directory is %s" % rootdir )

-- 
FSO frameworkd Debian packaging