Merge lp:~doanac/lava-dispatcher/configglue-warnings-hack into lp:lava-dispatcher

[Andy Doan]

its ugly, but it helps avoid some annoying messages from configglue.

[Michael Hudson-Doyle (mwhudson)]

+1

=== modified file 'doc/changes.rst'
--- doc/changes.rst	2013-01-10 02:57:27 +0000
+++ doc/changes.rst	2013-01-10 21:40:32 +0000
@@ -1,6 +1,12 @@
 Version History
 ***************
 
+.. _verison_0_30:
+
+Version 0.30
+============
+* Unreleased
+
 .. _verison_0_29:
 
 Version 0.29

=== modified file 'lava_dispatcher/__init__.py'
--- lava_dispatcher/__init__.py	2013-01-10 03:12:48 +0000
+++ lava_dispatcher/__init__.py	2013-01-10 21:40:32 +0000
@@ -18,4 +18,4 @@
 # along
 # with this program; if not, see <http://www.gnu.org/licenses>.
 
-__version__ = (0, 29, 1, "final", 0)
+__version__ = (0, 30, 0, "dev", 0)

=== modified file 'lava_dispatcher/config.py'
--- lava_dispatcher/config.py	2013-01-04 00:03:43 +0000
+++ lava_dispatcher/config.py	2013-01-10 21:40:32 +0000
@@ -198,6 +198,24 @@
     scp.extra_sections = set(scp.get('__main__', 'boot_options'))
 
 
+def _hack_report(report):
+    """
+    ConfigGlue makes warning for somethings we don't want to warn about. In
+    particular, it will warn if a value isn't known to the config such as
+    in the case where you are using config variables or where you define
+    something like a boot_option for master like "boot_cmds_fdt"
+    """
+    scrubbed = []
+    ignores = [
+        'Configuration includes invalid options for section',
+    ]
+    for err in report:
+        for ignore in ignores:
+            if not err.startswith(ignore):
+                scrubbed.append(err)
+    return scrubbed
+
+
 def get_device_config(name, config_dir):
     # We read the device config once to get the device type, then we start
     # again and read device-defaults, device-types/$device-type and
@@ -215,7 +233,11 @@
     _hack_boot_options(real_device_config)
     valid, report = real_device_config.is_valid(report=True)
     if not valid:
-        logging.warning("Device config for %s is not valid:\n    %s", name, '\n    '.join(report))
+        report = _hack_report(report)
+        if len(report) > 0:
+            report = '\n    '.join(report)
+            logging.warning(
+                "Device config for %s is not valid:\n    %s", name, report)
 
     return DeviceConfig(real_device_config)