[kernel] r7199 - dists/sid/linux-2.6/debian/lib/python/debian_linux

[Bastian Blank]

Author: waldi
Date: Sun Aug 20 11:07:00 2006
New Revision: 7199

Modified:
   dists/sid/linux-2.6/debian/lib/python/debian_linux/config.py

Log:
debian/lib/python/debian_linux/config.py: Fix merge order.


Modified: dists/sid/linux-2.6/debian/lib/python/debian_linux/config.py
==============================================================================
--- dists/sid/linux-2.6/debian/lib/python/debian_linux/config.py	(original)
+++ dists/sid/linux-2.6/debian/lib/python/debian_linux/config.py	Sun Aug 20 11:07:00 2006
@@ -173,11 +173,11 @@
         ret.update(self.get((section,), {}))
         if arch:
             ret.update(self.get((section, arch), {}))
+        if flavour and subarch and subarch != 'none':
+            ret.update(self.get((section, arch, 'none', flavour), {}))
         if subarch:
             ret.update(self.get((section, arch, subarch), {}))
         if flavour:
-            if subarch != 'none':
-                ret.update(self.get((section, arch, 'none', flavour), {}))
             ret.update(self.get((section, arch, subarch, flavour), {}))
         return ret