[kernel] r10655 - dists/trunk/linux-modules-nonfree-2.6/debian/bin

[Daniel Baumann]

Author: daniel
Date: Sun Feb 24 16:13:50 2008
New Revision: 10655

Log:
Copying fix from waldi to use package version.

Modified:
   dists/trunk/linux-modules-nonfree-2.6/debian/bin/gencontrol.py

Modified: dists/trunk/linux-modules-nonfree-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-modules-nonfree-2.6/debian/bin/gencontrol.py	(original)
+++ dists/trunk/linux-modules-nonfree-2.6/debian/bin/gencontrol.py	Sun Feb 24 16:13:50 2008
@@ -4,8 +4,8 @@
 sys.path.append(sys.argv[1] + "/lib/python")
 
 from debian_linux.config import ConfigCoreDump, ConfigParser, SchemaItemList
-from debian_linux.gencontrol import Gencontrol as Base
 from debian_linux.debian import *
+from debian_linux.gencontrol import Gencontrol as Base
 from debian_linux.utils import Templates
 
 class Gencontrol(Base):
@@ -16,8 +16,8 @@
     def do_main_setup(self, vars, makeflags, extra):
         super(Gencontrol, self).do_main_setup(vars, makeflags, extra)
         makeflags.update({
-            'VERSION_SOURCE': self.version.upstream,
-            'VERSION_DEBIAN': self.version.debian,
+            'VERSION_SOURCE': self.package_version.upstream,
+            'VERSION_DEBIAN': self.package_version.debian,
         })
 
     def do_main_makefile(self, makefile, makeflags, extra):
@@ -37,6 +37,10 @@
     def do_flavour(self, packages, makefile, arch, featureset, flavour, vars, makeflags, extra):
         config_entry = self.config['module', 'base']
 
+        config_base = self.config.merge('base', arch, featureset, flavour)
+        if not config_base.get('modules', True):
+            return
+
         super(Gencontrol, self).do_flavour(packages, makefile, arch, featureset, flavour, vars, makeflags, extra)
 
         for module in iter(config_entry['modules']):