r4036 - people/waldi/kernel/linux-2.6/debian/lib/python

[Bastian Blank]

Author: waldi
Date: 2005-08-23 17:49:12 +0000 (Tue, 23 Aug 2005)
New Revision: 4036

Modified:
   people/waldi/kernel/linux-2.6/debian/lib/python/debian_linux.py
Log:
debian/lib/python/debian_linux.py
(config): Support subarchitectures.


Modified: people/waldi/kernel/linux-2.6/debian/lib/python/debian_linux.py
===================================================================
--- people/waldi/kernel/linux-2.6/debian/lib/python/debian_linux.py	2005-08-23 17:40:58 UTC (rev 4035)
+++ people/waldi/kernel/linux-2.6/debian/lib/python/debian_linux.py	2005-08-23 17:49:12 UTC (rev 4036)
@@ -50,7 +50,16 @@
         self[arch] = t
         subarches = t.get('subarches', [])
         for subarch in subarches:
-            raise RuntimeError
+            try:
+                t2 = c.items_convert(subarch)
+                avail = t2.get('available', True)
+            except ConfigParser.NoSectionError:
+                t2 = {}
+                avail = True
+            if avail:
+                self._read_subarch(arch, subarch, t2)
+            else:
+                self['-'.join((arch, subarch))] = t2
         flavours = t.get('flavours', None)
         if flavours:
             for flavour in flavours:
@@ -87,6 +96,17 @@
                 t = {}
         self["%s-%s-%s" % (arch, subarch, flavour)] = t
 
+    def _read_subarch(self, arch, subarch, base):
+        file = "debian/arch/%s/%s/%s" % (arch, subarch, config_name)
+        c = config_parser(self.schema)
+        c.read(file)
+        t = c.items_convert('base')
+        base.update(t)
+        self['-'.join((arch, subarch))] = t
+        flavours = t.get('flavours', None)
+        for flavour in flavours:
+            self._read_flavour(arch, subarch, flavour, c)
+
 class config_parser(object, ConfigParser.ConfigParser):
     def __init__(self, schema):
         ConfigParser.ConfigParser.__init__(self)