debian/lib/python/debian_linux/utils.py: Support non control templates.

svn path=/dists/trunk/linux-2.6/; revision=6721

1 files changed, 12 insertions, 8 deletions

diff --git a/debian/lib/python/debian_linux/utils.py b/debian/lib/python/debian_linux/utils.py
index 1519e4ebb882..8fb7b5351b05 100644
--- a/debian/lib/python/debian_linux/utils.py
+++ b/debian/lib/python/debian_linux/utils.py
@@ -75,11 +75,8 @@ class field_string(str):
         return '\n '.join(self.split('\n'))
 
 class templates(dict):
-    def __init__(self, dir = None):
-        if dir is None:
-            self.dir = "debian/templates"
-        else:
-            self.dir = dir
+    def __init__(self, dir = "debian/templates"):
+        self.dir = dir
 
     def __getitem__(self, key):
         try:
@@ -92,10 +89,17 @@ class templates(dict):
     def __setitem__(self, key, value):
         raise NotImplemented()
 
-    def _read(self, filename):
-        entries = []
+    def _read(self, name):
+        prefix, id = name.split('.', 1)
+        f = file("%s/%s.in" % (self.dir, name))
+
+        if prefix == 'control':
+            return self._read_control(f)
 
-        f = file("%s/%s.in" % (self.dir, filename))
+        return f.read()
+
+    def _read_control(self, f):
+        entries = []
 
         while True:
             e = debian.package()