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

[Bastian Blank]

Author: waldi
Date: Sun Nov 13 15:40:08 2005
New Revision: 4802

Modified:
   people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
Log:
debian/lib/python/debian_linux/gencontrol.py: Also allow strings in makefile write list.


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 15:40:08 2005
@@ -88,7 +88,7 @@
                 if i.has_key('X-Version-Overwrite-Epoch'):
                         tmp.append("-v1:%s" % self.version['source'])
                 cmds.append("$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='-p%s' GENCONTROL_ARGS='%s'" % (i['Package'], ' '.join(tmp)))
-            makefile.append(("binary-arch-%s:: binary-arch-%s-extra" % (arch, arch), None))
+            makefile.append("binary-arch-%s:: binary-arch-%s-extra" % (arch, arch))
             makefile.append(("binary-arch-%s-extra:" % arch, cmds))
 
     def do_arch(self, packages, makefile, arch, vars, makeflags):
@@ -113,7 +113,7 @@
             packages.append(package_headers_arch)
 
         for i in (('binary-arch', 'setup',)):
-            makefile.append(("%s-%s:: %s-%s-real" % (i, arch, i, arch), None))
+            makefile.append("%s-%s:: %s-%s-real" % (i, arch, i, arch))
 
         makeflags['ARCH'] = arch
         makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
@@ -152,10 +152,10 @@
 
     def do_subarch_makefile(self, makefile, arch, subarch, makeflags):
         for i in ('binary-arch', 'build', 'setup'):
-            makefile.append(("%s-%s:: %s-%s-%s" % (i, arch, i, arch, subarch), None))
-            makefile.append(("%s-%s-%s::" % (i, arch, subarch), None))
+            makefile.append("%s-%s:: %s-%s-%s" % (i, arch, i, arch, subarch))
+            makefile.append("%s-%s-%s::" % (i, arch, subarch))
         for i in ('binary-arch', 'build', 'setup'):
-            makefile.append(("%s-%s-%s:: %s-%s-%s-real" % (i, arch, subarch, i, arch, subarch), None))
+            makefile.append("%s-%s-%s:: %s-%s-%s-real" % (i, arch, subarch, i, arch, subarch))
 
     def do_subarch_packages(self, packages, makefile, arch, subarch, vars, makeflags):
         headers_subarch = self.templates["control.headers.subarch"]
@@ -179,7 +179,7 @@
         cmds_setup = []
         cmds_setup.append(("$(MAKE) -f debian/rules.real setup-subarch %s" % makeflags_string,))
         makefile.append(("binary-arch-%s-%s-real:" % (arch, subarch), cmds_binary_arch))
-        makefile.append(("build-%s-%s-real:" % (arch, subarch), None))
+        makefile.append("build-%s-%s-real:" % (arch, subarch))
         makefile.append(("setup-%s-%s-real:" % (arch, subarch), cmds_setup))
 
     def do_flavour(self, packages, makefile, arch, subarch, flavour, vars, makeflags, package_headers_arch_depends):
@@ -216,8 +216,8 @@
         package_headers_arch_depends.append(packages_own[1]['Package'])
 
         for i in ('binary-arch', 'build', 'setup'):
-            makefile.append(("%s-%s-%s:: %s-%s-%s-%s" % (i, arch, subarch, i, arch, subarch, flavour), None))
-            makefile.append(("%s-%s-%s-%s:: %s-%s-%s-%s-real" % (i, arch, subarch, flavour, i, arch, subarch, flavour), None))
+            makefile.append("%s-%s-%s:: %s-%s-%s-%s" % (i, arch, subarch, i, arch, subarch, flavour))
+            makefile.append("%s-%s-%s-%s:: %s-%s-%s-%s-real" % (i, arch, subarch, flavour, i, arch, subarch, flavour))
 
         makeflags['FLAVOUR'] = flavour
         makeflags['TYPE'] = 'kernel-package'
@@ -362,16 +362,18 @@
     def write_control(self, list):
         self.write_rfc822(file("debian/control", 'w'), list)
 
-    def write_makefile(self, list):
-        f = file("debian/rules.gen", 'w')
-        for i in list:
-            f.write("%s\n" % i[0])
-            if i[1] is not None:
-                list = i[1]
-                if isinstance(list, basestring):
-                    list = list.split('\n')
-                for j in list:
-                    f.write("\t%s\n" % j)
+    def write_makefile(self, out_list):
+        out = file("debian/rules.gen", 'w')
+        for item in out_list:
+            if isinstance(item, (list, tuple)):
+                out.write("%s\n" % item[0])
+                cmd_list = item[1]
+                if isinstance(cmd_list, basestring):
+                    cmd_list = cmd_list.split('\n')
+                for j in cmd_list:
+                    out.write("\t%s\n" % j)
+            else:
+                out.write("%s\n" % item)
 
     def write_rfc822(self, f, list):
         for entry in list: