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

[Bastian Blank]

Author: waldi
Date: Fri Apr 14 16:12:41 2006
New Revision: 6421

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, debian/lib/python/debian_linux/gencontrol.py:
Set variables directly.


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:12:41 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.process_changelog()
 
     def do_main_setup(self, vars, makeflags):
         vars.update(self.config['image',])
@@ -166,12 +166,8 @@
         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
+        version = self.changelog[0]['Version']
+        self.changelog_vars = self.process_version(version)
 
     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:12:41 2006
@@ -245,6 +245,7 @@
         return entries
 
     def process_version(self, version):
+        self.version = version
         vars = {
             'upstreamversion': version['upstream'],
             'version': version['version'],
@@ -252,9 +253,9 @@
             'major': version['major'],
         }
         if version['modifier'] is not None:
-            vars['abiname'] = ''
+            self.abiname = vars['abiname'] = ''
         else:
-            vars['abiname'] = '-%s' % self.config['abiname',]['abiname']
+            self.abiname = vars['abiname'] = '-%s' % self.config['abiname',]['abiname']
         return vars
 
     def substitute(self, s, vars):