[kernel] r6424 - in dists/trunk/linux-2.6/debian: bin lib/python/debian_linux modules

[Bastian Blank]

Author: waldi
Date: Fri Apr 14 16:52:33 2006
New Revision: 6424

Modified:
   dists/trunk/linux-2.6/debian/bin/gencontrol.py
   dists/trunk/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
   dists/trunk/linux-2.6/debian/modules/gencontrol.py
Log:
debian/bin/gencontrol.py, debian/lib/python/debian_linux/gencontrol.py,
debian/modules/gencontrol.py
- Fix variable name.
- Use new version code in modules scripts.


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	Fri Apr 14 16:52:33 2006
@@ -14,7 +14,7 @@
         vars.update(self.config['image',])
 
     def do_main_packages(self, packages):
-        vars = self.changelog_vars
+        vars = self.vars
 
         main = self.templates["control.main"]
         packages.extend(self.process_packages(main, vars))
@@ -167,11 +167,11 @@
 
     def process_changelog(self):
         version = self.changelog[0]['Version']
-        self.changelog_vars = self.process_version(version)
+        self.process_version(version)
         if version['modifier'] is not None:
-            self.abiname = self.changelog_vars['abiname'] = ''
+            self.abiname = self.vars['abiname'] = ''
         else:
-            self.abiname = self.changelog_vars['abiname'] = '-%s' % self.config['abiname',]['abiname']
+            self.abiname = self.vars['abiname'] = '-%s' % self.config['abiname',]['abiname']
 
     def process_real_image(self, in_entry, depends, vars):
         entry = self.process_package(in_entry, vars)

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	Fri Apr 14 16:52:33 2006
@@ -31,7 +31,7 @@
 
     def do_source(self, packages):
         source = self.templates["control.source"]
-        packages['source'] = self.process_package(source[0], self.changelog_vars)
+        packages['source'] = self.process_package(source[0], self.vars)
 
     def do_main(self, packages, makefile):
         makeflags = {
@@ -45,7 +45,7 @@
             'REVISIONS': ' '.join([i['Version']['debian'] for i in self.changelog[::-1]]),
         }
 
-        vars = self.changelog_vars.copy()
+        vars = self.vars.copy()
 
         self.do_main_setup(vars, makeflags)
         self.do_main_packages(packages)
@@ -246,13 +246,12 @@
 
     def process_version(self, version):
         self.version = version
-        vars = {
+        self.vars = {
             'upstreamversion': version['upstream'],
             'version': version['version'],
             'source_upstream': version['source_upstream'],
             'major': version['major'],
         }
-        return vars
 
     def substitute(self, s, vars):
         if isinstance(s, (list, tuple)):

Modified: dists/trunk/linux-2.6/debian/modules/gencontrol.py
==============================================================================
--- dists/trunk/linux-2.6/debian/modules/gencontrol.py	(original)
+++ dists/trunk/linux-2.6/debian/modules/gencontrol.py	Fri Apr 14 16:52:33 2006
@@ -11,11 +11,10 @@
 
     def __init__(self, config):
         super(gencontrol, self).__init__(config)
-        self.config_version = config_parser({}, [sys.path[0] + "/../version"])
-        self.version, self.abiname, self.changelog_vars = self.process_config_version()
+        self.process_config_version(config_parser({}, [sys.path[0] + "/../version"]))
 
     def do_main_packages(self, packages):
-        vars = self.changelog_vars
+        vars = self.vars
 
         main = self.templates["control.main"]
         packages.extend(self.process_packages(main, vars))
@@ -53,15 +52,10 @@
         makefile.append(("build-%s-%s-%s-real:" % (arch, subarch, flavour), cmds_build))
         makefile.append(("setup-%s-%s-%s-real:" % (arch, subarch, flavour), cmds_setup))
 
-    def process_config_version(self):
-        # TODO: unify with process_changelog
-        vars = self.config_version['version',]
-        version = parse_version(vars['source'])
-        vars['upstreamversion'] = version['upstream']
-        vars['version'] = version['version']
-        vars['source_upstream'] = version['source_upstream']
-        vars['major'] = version['major']
-        return version, vars['abiname'], vars
+    def process_config_version(self, config):
+        entry = config['version',]
+        self.process_version(parse_version(entry['source']))
+        self.vars['abiname'] = self.abiname = entry['abiname']
 
 if __name__ == '__main__':
     gencontrol(sys.path[0] + "/../arch")()