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

[Bastian Blank]

Author: waldi
Date: Sun Nov 13 14:56:37 2005
New Revision: 4798

Modified:
   people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
Log:
debian/lib/python/debian_linux/gencontrol.py:
Don't try to generation extra packages if the template does not exist.


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	Sun Nov 13 14:56:37 2005
@@ -22,6 +22,7 @@
         makefile = []
 
         self.do(packages, makefile)
+        self.do_extra(packages, makefile)
 
         self.write_control(packages.itervalues())
         self.write_makefile(makefile)
@@ -56,23 +57,25 @@
         for arch in iter(self.config['base']['arches']):
             self.do_arch(packages, makefile, arch, vars.copy(), makeflags.copy())
 
-        extra = self.templates["control.extra"]
-        packages.extend(self.process_packages(extra, vars))
-        extra_pn = {}
-        for i in extra:
-            arches = i['Architecture'].split(' ')
+    def do_extra(self, packages, makefile):
+        try:
+            templates_extra = self.templates["control.extra"]
+        except IOError:
+            return
+
+        packages.extend(self.process_packages(templates_extra, {}))
+        extra_arches = {}
+        for package in templates_extra:
+            arches = package['Architecture'].split(' ')
             for arch in arches:
-                pn = extra_pn.get(arch, [])
-                pn.append(i)
-                extra_pn[arch] = pn
-        archs = extra_pn.keys()
+                i = extra_arches.get(arch, [])
+                i.append(package)
+                extra_arches[arch] = i
+        archs = extra_arches.keys()
         archs.sort()
         for arch in archs:
-            arch_vars = vars.copy()
-            arch_vars.update(self.config[arch])
-
             cmds = []
-            for i in extra_pn[arch]:
+            for i in extra_arches[arch]:
                 tmp = []
                 if i.has_key('X-Version-Overwrite-Epoch'):
                         tmp.append("-v1:%s" % self.version['source'])