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

[Bastian Blank]

Author: waldi
Date: Fri Apr 14 16:07:56 2006
New Revision: 6420

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: Move changelog processing.
* debian/lib/python/debian_linux/gencontrol.py:
  Add generic version processing.


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:07:56 2006
@@ -8,7 +8,7 @@
     def __init__(self):
         super(gencontrol, self).__init__()
         self.changelog = read_changelog()
-        self.version, self.abiname, self.changelog_vars = self.process_changelog({})
+        self.version, self.abiname, self.changelog_vars = self.process_changelog()
 
     def do_main_setup(self, vars, makeflags):
         vars.update(self.config['image',])
@@ -165,6 +165,14 @@
         makefile.append(("setup-%s-%s-%s-real:" % (arch, subarch, flavour), cmds_setup))
         makefile.append(("source-%s-%s-%s-real:" % (arch, subarch, flavour)))
 
+    def process_changelog(self):
+        ret = [None, None, None]
+        ret[0] = version = self.changelog[0]['Version']
+        vars = self.process_version(version)
+        ret[1] = vars['abiname']
+        ret[2] = vars
+        return ret
+
     def process_real_image(self, in_entry, depends, vars):
         entry = self.process_package(in_entry, vars)
         if vars.has_key('desc'):

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:07:56 2006
@@ -202,22 +202,6 @@
     def do_flavour_packages(self, packages, makefile, arch, subarch, flavour, vars, makeflags, extra):
         pass
 
-    # TODO: Move away, linux-2.6 specific; unify with modules process_config_version
-    def process_changelog(self, in_vars):
-        ret = [None, None, None]
-        ret[0] = version = self.changelog[0]['Version']
-        vars = in_vars.copy()
-        if version['modifier'] is not None:
-            ret[1] = vars['abiname'] = ''
-        else:
-            ret[1] = vars['abiname'] = '-%s' % self.config['abiname',]['abiname']
-        vars['upstreamversion'] = version['upstream']
-        vars['version'] = version['version']
-        vars['source_upstream'] = version['source_upstream']
-        vars['major'] = version['major']
-        ret[2] = vars
-        return ret
-
     def process_relation(self, key, e, in_e, vars):
         in_dep = in_e[key]
         dep = package_relation_list()
@@ -260,6 +244,19 @@
             entries.append(self.process_package(i, vars))
         return entries
 
+    def process_version(self, version):
+        vars = {
+            'upstreamversion': version['upstream'],
+            'version': version['version'],
+            'source_upstream': version['source_upstream'],
+            'major': version['major'],
+        }
+        if version['modifier'] is not None:
+            vars['abiname'] = ''
+        else:
+            vars['abiname'] = '-%s' % self.config['abiname',]['abiname']
+        return vars
+
     def substitute(self, s, vars):
         if isinstance(s, (list, tuple)):
             for i in xrange(len(s)):