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

[Bastian Blank]

Author: waldi
Date: 2005-08-23 21:12:53 +0000 (Tue, 23 Aug 2005)
New Revision: 4039

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


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 20:42:52 UTC (rev 4038)
+++ people/waldi/kernel/linux-2.6/debian/lib/python/debian_linux.py	2005-08-23 21:12:53 UTC (rev 4039)
@@ -1,7 +1,5 @@
 import os, os.path, re, sys, textwrap, ConfigParser
 
-config_name = "defines"
-
 class schema_item_boolean(object):
     def __call__(self, i):
         i = i.strip().lower()
@@ -38,13 +36,23 @@
         'suggests': schema_item_string,
     }
 
-    def __init__(self):
+    config_name = "defines"
+
+    def __init__(self, overlay_dir = None):
+        self._overlay_dir = overlay_dir
         self._read_base()
 
+    def _get_files(self, name):
+        ret = []
+        if self._overlay_dir is not None:
+            ret.append(os.path.join(self._overlay_dir, name))
+        ret.append(name)
+        return ret
+
     def _read_arch(self, arch, base):
-        file = "debian/arch/%s/%s" % (arch, config_name)
+        files = self._get_files("debian/arch/%s/%s" % (arch, self.config_name))
         c = config_parser(self.schema)
-        c.read(file)
+        c.read(files)
         t = c.items_convert('base')
         base.update(t)
         self[arch] = t
@@ -68,9 +76,9 @@
         t['subarches'] = subarches
 
     def _read_base(self):
-        file = "debian/arch/%s" % config_name
+        files = self._get_files("debian/arch/%s" % self.config_name)
         c = config_parser(self.schema)
-        c.read(file)
+        c.read(files)
         t1 = c.items_convert('base')
         self['base'] = t1
         for arch in t1['arches']:
@@ -97,9 +105,9 @@
         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)
+        files = self._get_files("debian/arch/%s/%s/%s" % (arch, subarch, self.config_name))
         c = config_parser(self.schema)
-        c.read(file)
+        c.read(files)
         t = c.items_convert('base')
         base.update(t)
         self['-'.join((arch, subarch))] = t