[kernel] r7202 - in dists/sid/linux-2.6/debian: bin modules

[Bastian Blank]

Author: waldi
Date: Sun Aug 20 11:36:33 2006
New Revision: 7202

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

Log:
debian/bin/gencontrol.py, debian/lib/python/debian_linux/gencontrol.py,
debian/modules/gencontrol.py: Simplify version processing.


Modified: dists/sid/linux-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/sid/linux-2.6/debian/bin/gencontrol.py	(original)
+++ dists/sid/linux-2.6/debian/bin/gencontrol.py	Sun Aug 20 11:36:33 2006
@@ -188,12 +188,12 @@
         file('debian/bin/patch-unpatch', 'w').write(unpatch)
 
     def process_changelog(self):
-        version = self.changelog[0]['Version']
-        self.process_version(version)
-        if version['linux']['modifier'] is not None:
-            self.abiname = self.vars['abiname'] = ''
+        self.version = self.changelog[0]['Version']
+        if self.version['linux']['modifier'] is not None:
+            self.abiname = ''
         else:
-            self.abiname = self.vars['abiname'] = '-%s' % self.config['abi',]['abiname']
+            self.abiname = '-%s' % self.config['abi',]['abiname']
+        self.vars = self.process_version_linux(self.version, self.abiname)
 
     def process_real_image(self, in_entry, relations, config, vars):
         entry = self.process_package(in_entry, vars)

Modified: dists/sid/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- dists/sid/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	(original)
+++ dists/sid/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	Sun Aug 20 11:36:33 2006
@@ -234,13 +234,13 @@
             entries.append(self.process_package(i, vars))
         return entries
 
-    def process_version(self, version):
-        self.version = version
-        self.vars = {
+    def process_version_linux(self, version, abiname):
+        return {
             'upstreamversion': version['linux']['upstream'],
             'version': version['linux']['version'],
             'source_upstream': version['linux']['source_upstream'],
             'major': version['linux']['major'],
+            'abiname': abiname,
         }
 
     def substitute(self, s, vars):

Modified: dists/sid/linux-2.6/debian/modules/gencontrol.py
==============================================================================
--- dists/sid/linux-2.6/debian/modules/gencontrol.py	(original)
+++ dists/sid/linux-2.6/debian/modules/gencontrol.py	Sun Aug 20 11:36:33 2006
@@ -53,8 +53,9 @@
 
     def process_config_version(self, config):
         entry = config['version',]
-        self.process_version(parse_version(entry['source']))
-        self.vars['abiname'] = self.abiname = entry['abiname']
+        self.version = parse_version(entry['source'])
+        self.abiname = entry['abiname']
+        self.vars = self.process_version_linux(self.version, self.abiname)
 
 if __name__ == '__main__':
     gencontrol(sys.path[0] + "/../arch")()