[kernel] r6877 - in dists/trunk/linux-2.6/debian: bin

[Bastian Blank]

Author: waldi
Date: Sat Jun 24 11:58:54 2006
New Revision: 6877

Modified:
   dists/trunk/linux-2.6/debian/bin/gencontrol.py
   dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py

Log:
* debian/bin/gencontrol.py: Call main setup method from super class.
* debian/lib/python/debian_linux/gencontrol.py:
  Move makeflags setup to setup method.


Modified: dists/trunk/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/gencontrol.py	(original)
+++ dists/trunk/linux-2.6/debian/bin/gencontrol.py	Sat Jun 24 11:58:54 2006
@@ -11,6 +11,7 @@
         self.process_changelog()
 
     def do_main_setup(self, vars, makeflags, extra):
+        super(gencontrol, self).do_main_setup(vars, makeflags, extra)
         vars.update(self.config['image',])
         makeflags['REVISIONS'] = ' '.join([i['Version']['debian'] for i in self.changelog[::-1]])
 

Modified: dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	(original)
+++ dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	Sat Jun 24 11:58:54 2006
@@ -38,15 +38,7 @@
         vars = self.vars.copy()
         vars.update(config_entry)
 
-        makeflags = {
-            'MAJOR': self.version['major'],
-            'VERSION': self.version['version'],
-            'SOURCE_UPSTREAM': self.version['source_upstream'],
-            'SOURCEVERSION': self.version['source'],
-            'UPSTREAMVERSION': self.version['upstream'],
-            'ABINAME': self.abiname,
-        }
-
+        makeflags = {}
         extra = {}
 
         self.do_main_setup(vars, makeflags, extra)
@@ -57,7 +49,14 @@
             self.do_arch(packages, makefile, arch, vars.copy(), makeflags.copy(), extra)
 
     def do_main_setup(self, vars, makeflags, extra):
-        pass
+        makeflags.update({
+            'MAJOR': self.version['major'],
+            'VERSION': self.version['version'],
+            'SOURCE_UPSTREAM': self.version['source_upstream'],
+            'SOURCEVERSION': self.version['source'],
+            'UPSTREAMVERSION': self.version['upstream'],
+            'ABINAME': self.abiname,
+        })
 
     def do_main_makefile(self, makefile, makeflags, extra):
         makeflags_string = ' '.join(["%s='%s'" % i for i in makeflags.iteritems()])