[kernel] r15358 - dists/lenny-security/linux-modules-extra-2.6/debian/bin

[Ben Hutchings]

Author: benh
Date: Fri Mar 12 03:21:30 2010
New Revision: 15358

Log:
Look up source relation in per-module configuration

Modified:
   dists/lenny-security/linux-modules-extra-2.6/debian/bin/gencontrol.py

Modified: dists/lenny-security/linux-modules-extra-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/lenny-security/linux-modules-extra-2.6/debian/bin/gencontrol.py	Fri Mar 12 02:44:20 2010	(r15357)
+++ dists/lenny-security/linux-modules-extra-2.6/debian/bin/gencontrol.py	Fri Mar 12 03:21:30 2010	(r15358)
@@ -49,7 +49,6 @@
 
     def do_module(self, module, packages, makefile, arch, featureset, flavour, vars, makeflags, extra):
         config_entry = self.config['module', 'base', module]
-        config_entry_relations = self.config.get(('relations', module), {})
         vars.update(config_entry)
         vars['module'] = module
         makeflags['MODULE'] = module
@@ -70,7 +69,7 @@
         if flavour in config_entry.get('not-flavours', []):
             return
 
-        relations = PackageRelation(config_entry_relations.get('source', '%s-source' % module))
+        relations = PackageRelation(config_entry.get('source', '%s-source' % module))
         if config_entry.get('arches', None) or config_entry.get('not-arches', None):
             for group in relations:
                 for item in group: