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

[Bastian Blank]

Author: waldi
Date: Fri Apr 14 16:17:39 2006
New Revision: 6422

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:
Move initial abiname handling into special code.


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:17:39 2006
@@ -168,6 +168,10 @@
     def process_changelog(self):
         version = self.changelog[0]['Version']
         self.changelog_vars = self.process_version(version)
+        if version['modifier'] is not None:
+            self.abiname = self.changelog_vars['abiname'] = ''
+        else:
+            self.abiname = self.changelog_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:17:39 2006
@@ -252,10 +252,6 @@
             'source_upstream': version['source_upstream'],
             'major': version['major'],
         }
-        if version['modifier'] is not None:
-            self.abiname = vars['abiname'] = ''
-        else:
-            self.abiname = vars['abiname'] = '-%s' % self.config['abiname',]['abiname']
         return vars
 
     def substitute(self, s, vars):