[kernel] r18500 - dists/trunk/linux-2.6/debian/lib/python/debian_linux

[Bastian Blank]

Author: waldi
Date: Wed Jan 11 20:50:14 2012
New Revision: 18500

Log:
debian/lib/python/debian_linux/config.py:
Make config file name generation easier.

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

Modified: dists/trunk/linux-2.6/debian/lib/python/debian_linux/config.py
==============================================================================
--- dists/trunk/linux-2.6/debian/lib/python/debian_linux/config.py	Wed Jan 11 20:42:40 2012	(r18499)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/config.py	Wed Jan 11 20:50:14 2012	(r18500)
@@ -113,12 +113,14 @@
             self.read(ret)
             return ret
 
-        def get_files(self, name):
-            return [os.path.join(i, name) for i in self.dirs if i]
+        def get_files(self, *dirs):
+            dirs = list(dirs)
+            dirs.append(self.config_name)
+            return (os.path.join(i, *dirs) for i in self.dirs if i)
 
         def read_arch(self, ret, arch):
             config = ConfigParser(self.schema)
-            config.read(self.get_files("%s/%s" % (arch, self.config_name)))
+            config.read(self.get_files(arch))
 
             featuresets = config['base', ].get('featuresets', [])
             flavours = config['base', ].get('flavours', [])
@@ -147,7 +149,7 @@
 
         def read_arch_featureset(self, ret, arch, featureset):
             config = ConfigParser(self.schema)
-            config.read(self.get_files("%s/%s/%s" % (arch, featureset, self.config_name)))
+            config.read(self.get_files(arch, featureset))
 
             flavours = config['base', ].get('flavours', [])
 
@@ -159,7 +161,7 @@
 
         def read(self, ret):
             config = ConfigParser(self.schema)
-            config.read(self.get_files(self.config_name))
+            config.read(self.get_files())
 
             arches = config['base', ]['arches']
             featuresets = config['base', ].get('featuresets', [])
@@ -178,7 +180,7 @@
 
         def read_featureset(self, ret, featureset):
             config = ConfigParser(self.schema)
-            config.read(self.get_files("featureset-%s/%s" % (featureset, self.config_name)))
+            config.read(self.get_files('featureset-%s' % featureset))
 
             for section in iter(config):
                 real = (section[-1], None, featureset)