[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[PATCH 1/4] Don't require '.in' suffix on templates



The PO files processed by debconf-updatepo, which in our case are
templates, must have names ending in .po rather than .in.  So look for
un-suffixed template files after looking for files with the .in
suffix.

--- a/debian/lib/python/debian_linux/utils.py
+++ b/debian/lib/python/debian_linux/utils.py
@@ -19,13 +19,14 @@ class Templates(object):
     def _read(self, name):
         prefix, id = name.split('.', 1)
 
-        for dir in self.dirs:
-            filename = "%s/%s.in" % (dir, name)
-            if os.path.exists(filename):
-                f = codecs.open(filename, 'r', 'utf-8')
-                if prefix == 'control':
-                    return read_control(f)
-                return f.read()
+        for suffix in ['.in', '']:
+            for dir in self.dirs:
+                filename = "%s/%s%s" % (dir, name, suffix)
+                if os.path.exists(filename):
+                    f = codecs.open(filename, 'r', 'utf-8')
+                    if prefix == 'control':
+                        return read_control(f)
+                    return f.read()
 
     def get(self, key, default=None):
         if key in self._cache:


-- 
Ben Hutchings
Man invented language to satisfy his deep need to complain. - Lily Tomlin

Attachment: signature.asc
Description: This is a digitally signed message part


Reply to: