[kernel] r5234 - in people/waldi/linux-2.6/debian: bin lib/python/debian_linux

[Bastian Blank]

Author: waldi
Date: Wed Jan  4 14:34:59 2006
New Revision: 5234

Modified:
   people/waldi/linux-2.6/debian/bin/gencontrol.py
   people/waldi/linux-2.6/debian/lib/python/debian_linux/config.py
Log:
* debian/bin/gencontrol.py: Use config entry merging when needed.
* lib/python/debian_linux/config.py: Readd config entry merging.


Modified: people/waldi/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- people/waldi/linux-2.6/debian/bin/gencontrol.py	(original)
+++ people/waldi/linux-2.6/debian/bin/gencontrol.py	Wed Jan  4 14:34:59 2006
@@ -34,7 +34,6 @@
         makefile.append(("build-%s-real:" % arch))
 
     def do_arch_packages_post(self, packages, makefile, arch, vars, makeflags, extra):
-        config_entry = self.config['base', arch]
         makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
 
         # Append this here so it only occurs on the install-headers-all line
@@ -44,7 +43,7 @@
         makefile.append(("binary-arch-%s-real:" % arch, cmds_binary_arch))
 
     def do_subarch_makeflags(self, makeflags, arch, subarch):
-        config_entry = self.config['base', arch, subarch]
+        config_entry = self.config.merge('base', arch, subarch)
         for i in ('kernel-header-dirs', 'KERNEL_HEADER_DIRS'),:
             if config_entry.has_key(i[0]):
                 makeflags[i[1]] = config_entry[i[0]]
@@ -72,7 +71,7 @@
         makefile.append(("setup-%s-%s-real:" % (arch, subarch), cmds_setup))
 
     def do_flavour_makeflags(self, makeflags, arch, subarch, flavour):
-        config_entry = self.config['base', arch, subarch, flavour]
+        config_entry = self.config.merge('base', arch, subarch, flavour)
         makeflags['TYPE'] = 'kernel-package'
         for i in (
             ('compiler', 'COMPILER'),

Modified: people/waldi/linux-2.6/debian/lib/python/debian_linux/config.py
==============================================================================
--- people/waldi/linux-2.6/debian/lib/python/debian_linux/config.py	(original)
+++ people/waldi/linux-2.6/debian/lib/python/debian_linux/config.py	Wed Jan  4 14:34:59 2006
@@ -147,6 +147,17 @@
             raise KeyError, key
         return ret
 
+    def merge(self, section, *args):
+        ret = {}
+        for i in xrange(0, len(args) + 1):
+            ret.update(self.get(tuple([section] + list(args[:i])), {}))
+        if section == 'base':
+            for i in ('abiname', 'arches', 'flavours', 'subarches'):
+                try:
+                    del ret[i]
+                except KeyError: pass
+        return ret
+
     def sections(self):
         return super(config_reader, self).keys()