[kernel] r6012 - people/waldi/linux-2.6/debian/lib/python/debian_linux

[Bastian Blank]

Author: waldi
Date: Thu Mar  2 12:20:58 2006
New Revision: 6012

Modified:
   people/waldi/linux-2.6/debian/lib/python/debian_linux/config.py
Log:
debian/lib/python/debian_linux/config.py: Fix section parsing.


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	Thu Mar  2 12:20:58 2006
@@ -59,12 +59,17 @@
 
         for section in iter(config):
             real = list(section)
+            # TODO
             if real[-1] in subarches:
                 real[0:0] = ['base', arch]
             elif real[-1] in flavours:
                 real[0:0] = ['base', arch, 'none']
             else:
-                real[0:] = [real.pop(), arch]
+                real[0:0] = [real.pop()]
+                if real[-1] in flavours:
+                    real[1:1] = [arch, 'none']
+                else:
+                    real[1:1] = [arch]
             real = tuple(real)
             s = self.get(real, {})
             s.update(config[section])