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

[Bastian Blank]

Author: waldi
Date: Sun Nov 13 15:04:25 2005
New Revision: 4799

Modified:
   people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
Log:
debian/lib/python/debian_linux/gencontrol.py:
Begin to split methods in smaller pieces.


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:04:25 2005
@@ -21,24 +21,18 @@
         packages = packages_list()
         makefile = []
 
-        self.do(packages, makefile)
+        self.do_source(packages)
+        self.do_main(packages, makefile)
         self.do_extra(packages, makefile)
 
         self.write_control(packages.itervalues())
         self.write_makefile(makefile)
 
-    def do(self, packages, makefile):
-        vars = self.changelog_vars
-
+    def do_source(self, packages):
         source = self.templates["control.source"]
-        packages['source'] = self.process_package(source[0], vars)
-
-        main = self.templates["control.main"]
-        packages.extend(self.process_packages(main, vars))
-
-        tree = self.templates["control.tree"]
-        packages.append(self.process_real_tree(tree[0], vars))
+        packages['source'] = self.process_package(source[0], self.changelog_vars)
 
+    def do_main(self, packages, makefile):
         makeflags = {
             'VERSION': self.version['version'],
             'SOURCE_UPSTREAM': self.version['source_upstream'],
@@ -48,15 +42,29 @@
             'KPKG_ABINAME': self.kpkg_abiname,
             'REVISIONS': ' '.join([i['Version']['debian'] for i in self.changelog[::-1]]),
         }
+
+        self.do_main_packages(packages)
+        self.do_main_makefile(makefile, makeflags)
+
+        for arch in iter(self.config['base']['arches']):
+            self.do_arch(packages, makefile, arch, self.changelog_vars.copy(), makeflags.copy())
+
+    def do_main_packages(self, packages):
+        vars = self.changelog_vars
+
+        main = self.templates["control.main"]
+        packages.extend(self.process_packages(main, vars))
+
+        tree = self.templates["control.tree"]
+        packages.append(self.process_real_tree(tree[0], vars))
+
+    def do_main_makefile(self, makefile, makeflags):
         makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])
 
         cmds_binary_indep = []
         cmds_binary_indep.append(("$(MAKE) -f debian/rules.real binary-indep %s" % makeflags_string,))
         makefile.append(("binary-indep:", cmds_binary_indep))
 
-        for arch in iter(self.config['base']['arches']):
-            self.do_arch(packages, makefile, arch, vars.copy(), makeflags.copy())
-
     def do_extra(self, packages, makefile):
         try:
             templates_extra = self.templates["control.extra"]