[kernel] r10141 - dists/trunk/linux-modules-extra-2.6/debian/bin

[Bastian Blank]

Author: waldi
Date: Fri Jan 18 22:59:52 2008
New Revision: 10141

Log:
debian/bin/gencontrol.py: Fix generation of arch list in module source deps.


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

Modified: dists/trunk/linux-modules-extra-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-modules-extra-2.6/debian/bin/gencontrol.py	(original)
+++ dists/trunk/linux-modules-extra-2.6/debian/bin/gencontrol.py	Fri Jan 18 22:59:52 2008
@@ -66,10 +66,13 @@
             vars['longdesc'] = ''
 
         relations = PackageRelation(config_entry_relations.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:
-                    item.arches = [arch]
+        arches = config_entry.get('arches', self.config['base',]['arches'])
+        for arch in config_entry.get('not-arches', []):
+            if arch in arches:
+                arches.remove(arch)
+        for group in relations:
+            for item in group:
+                item.arches = arches
         makeflags['MODULESOURCE'] = relations[0][0].name
 
         packages['source']['Build-Depends'].extend(relations)