[firmware-nonfree] 02/05: debian/lib/python/config.py: Separate schemas for top-level and package config

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository firmware-nonfree.

commit cd8e374d7bc40c90e8d3af94e652ba27b2df622c
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Wed Dec 14 03:49:41 2016 +0000

    debian/lib/python/config.py: Separate schemas for top-level and package config
---
 debian/lib/python/config.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/debian/lib/python/config.py b/debian/lib/python/config.py
index 79e2151..62ebbd7 100644
--- a/debian/lib/python/config.py
+++ b/debian/lib/python/config.py
@@ -3,22 +3,27 @@ from debian_linux.config import ConfigParser, SchemaItemList
 class Config(dict):
     config_name = "defines"
 
-    schemas = {
+    top_schemas = {
         'base': {
-            'files': SchemaItemList(),
             'packages': SchemaItemList(),
-            'support': SchemaItemList(),
         },
         'upstream': {
             'exclude': SchemaItemList()
         }
     }
 
+    package_schemas = {
+        'base': {
+            'files': SchemaItemList(),
+            'support': SchemaItemList(),
+        }
+    }
+
     def __init__(self):
         self._read_base()
 
     def _read_base(self):
-        config = ConfigParser(self.schemas)
+        config = ConfigParser(self.top_schemas)
         config.read("debian/config/%s" % self.config_name)
 
         packages = config['base',]['packages']
@@ -31,7 +36,7 @@ class Config(dict):
             self._read_package(package)
 
     def _read_package(self, package):
-        config = ConfigParser(self.schemas)
+        config = ConfigParser(self.package_schemas)
         config.read("debian/config/%s/%s" % (package, self.config_name))
 
         for section in iter(config):

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/firmware-nonfree.git