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

[Bastian Blank]

Author: waldi
Date: Thu Mar  2 12:27:44 2006
New Revision: 6013

Modified:
   people/waldi/linux-2.6/debian/lib/python/debian_linux/config.py
   people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
Log:
* debian/lib/python/debian_linux/config.py: Use a list of directories.
* debian/lib/python/debian_linux/gencontrol.py: Update.


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:27:44 2006
@@ -36,19 +36,15 @@
 
     config_name = "defines"
 
-    def __init__(self, underlay = None):
-        self._underlay = underlay
+    def __init__(self, dirs = []):
+        self._dirs = dirs
         self._read_base()
 
     def __getitem__(self, key):
         return self.get(key)
 
     def _get_files(self, name):
-        ret = []
-        if self._underlay is not None:
-            ret.append(os.path.join(self._underlay, name))
-        ret.append(os.path.join('debian/arch', name))
-        return ret
+        return [os.path.join(i, name) for i in self._dirs if i]
 
     def _read_arch(self, arch):
         files = self._get_files("%s/%s" % (arch, self.config_name))

Modified: people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	(original)
+++ people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	Thu Mar  2 12:27:44 2006
@@ -14,7 +14,7 @@
 class gencontrol(object):
     def __init__(self, underlay = None):
         self.changelog = read_changelog()
-        self.config = config_reader(underlay)
+        self.config = config_reader(["debian/arch", underlay])
         self.templates = templates()
         self.version, self.abiname, self.changelog_vars = self.process_changelog({})
 
@@ -186,7 +186,6 @@
         for i in (
             ('compiler', 'COMPILER'),
             ('kernel-arch', 'KERNEL_ARCH')
-            ('initrd', 'INITRD')
         ):  
             if config_entry.has_key(i[0]):
                 makeflags[i[1]] = config_entry[i[0]]