Enhance the configuration system to allow getting configuration bits helping with different packages|plugins

Do not print the lines around --print-config, so we can save it directly into correct configuration file

3 files changed, 13 insertions, 3 deletions

diff --git a/etc/firstaidkit.conf b/etc/firstaidkit/firstaidkit.conf
index 72481a2..72481a2 100644
--- a/etc/firstaidkit.conf
+++ b/etc/firstaidkit/firstaidkit.conf
diff --git a/firstaidkit b/firstaidkit
index ed4703f..4da0d94 100755
--- a/firstaidkit
+++ b/firstaidkit
@@ -187,9 +187,7 @@ if __name__=="__main__":
         sys.exit(1)
 
     if Flags.print_config:
-        print 76*"-"
         Config.write(sys.stdout)
-        print 76*"-"
         sys.exit(0)
 
     Config.lock()
diff --git a/pyfirstaidkit/configuration.py b/pyfirstaidkit/configuration.py
index 3d222bd..94a3243 100644
--- a/pyfirstaidkit/configuration.py
+++ b/pyfirstaidkit/configuration.py
@@ -23,7 +23,7 @@ from shlex import shlex
 if os.environ.has_key("FIRST_AID_KIT_CONF"):
     cfgfile = os.environ["FIRST_AID_KIT_CONF"].split(":")
 else:
-    cfgfile = ["/etc/firstaidkit.conf", os.environ["HOME"]+"/.firstaidkit.conf"]
+    cfgfile = ["/etc/firstaidkit/firstaidkit.conf", os.environ["HOME"]+"/.firstaidkit.conf"]
 
 
 def createDefaultConfig(config):
@@ -46,6 +46,9 @@ def createDefaultConfig(config):
     else:
         config.system.root = "/"
 
+    # Set the directory containing cfg bits for different services/packages
+    config.system.configuration = "/etc/firstaidkit"
+
     #
     # There will be 4 default places where FAK will look for plugins,  these 4 names
     # will be reserved in the configuration.  lib{,64}-firstaidkit-{,examples}
@@ -123,4 +126,13 @@ Config = FAKConfig()
 createDefaultConfig(Config)
 Config.read(cfgfile)
 
+def getConfigBits(name, cfg = Config):
+    """returns configuration object loaded with bits from designated configuration file/service
+    
+       name - service you need info from
+       cfg - configuration object containing the system.configuration value, to specify, where to look for the service file"""
+    c = FAKConfig()
+    c.read(os.path.join(cfg.system.configuration, name))
+    c.lock()
+    return c